Add 2010 to copyright years.

[gnu-emacs] / lisp / epa.el

diff --git a/lisp/epa.el b/lisp/epa.el
index 18c2ff3e289d05cbc350884996420c18e09f1744..ea438f0073a5f0c22dec35bc254a55bc01b30a3a 100644 (file)
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -1,5 +1,5 @@
 ;;; epa.el --- the EasyPG Assistant
-;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
@@ -234,7 +234,7 @@ You should bind this variable with `let', but do not set it globally.")
       '(menu-item "Decrypt File..." epa-decrypt-file
                  :help "Decrypt FILE"))
     (define-key menu-map [epa-encrypt-file]
-      '(menu-item "Encrypt File.." epa-encrypt-file
+      '(menu-item "Encrypt File..." epa-encrypt-file
                  :help "Encrypt FILE for RECIPIENTS"))
     (define-key menu-map [separator-epa-key-list] '(menu-item "--"))
     (define-key menu-map [epa-key-list-delete-keys]
@@ -269,7 +269,8 @@ You should bind this variable with `let', but do not set it globally.")
   :help-echo 'epa--key-widget-help-echo)
 
 (defun epa--key-widget-action (widget &optional event)
-  (epa--show-key (widget-get widget :value)))
+  (save-selected-window
+    (epa--show-key (widget-get widget :value))))
 
 (defun epa--key-widget-value-create (widget)
   (let* ((key (widget-get widget :value))
@@ -327,7 +328,7 @@ You should bind this variable with `let', but do not set it globally.")
   (make-local-variable 'epa-exit-buffer-function)
   (make-local-variable 'revert-buffer-function)
   (setq revert-buffer-function 'epa--key-list-revert-buffer)
-  (run-hooks 'epa-key-list-mode-hook))
+  (run-mode-hooks 'epa-key-list-mode-hook))
 
 (defun epa-key-mode ()
   "Major mode for a key description."
@@ -344,7 +345,7 @@ You should bind this variable with `let', but do not set it globally.")
   ;; if buffer-file-name is not set.
   (font-lock-set-defaults)
   (make-local-variable 'epa-exit-buffer-function)
-  (run-hooks 'epa-key-mode-hook))
+  (run-mode-hooks 'epa-key-mode-hook))
 
 (defun epa-info-mode ()
   "Major mode for `epa-info-buffer'."
@@ -355,7 +356,7 @@ You should bind this variable with `let', but do not set it globally.")
        truncate-lines t
        buffer-read-only t)
   (use-local-map epa-info-mode-map)
-  (run-hooks 'epa-info-mode-hook))
+  (run-mode-hooks 'epa-info-mode-hook))
 
 (defun epa-mark-key (&optional arg)
   "Mark a key on the current line.
@@ -462,8 +463,7 @@ If ARG is non-nil, mark the key."
   (apply #'epa--list-keys epa-list-keys-arguments))
 
 (defun epa--marked-keys ()
-  (or (save-excursion
-       (set-buffer epa-keys-buffer)
+  (or (with-current-buffer epa-keys-buffer
        (goto-char (point-min))
        (let (keys key)
          (while (re-search-forward "^\\*" nil t)
@@ -478,11 +478,10 @@ If ARG is non-nil, mark the key."
              (list key))))))
 
 (defun epa--select-keys (prompt keys)
-  (save-excursion
-    (unless (and epa-keys-buffer
-                (buffer-live-p epa-keys-buffer))
-      (setq epa-keys-buffer (generate-new-buffer "*Keys*")))
-    (set-buffer epa-keys-buffer)
+  (unless (and epa-keys-buffer
+               (buffer-live-p epa-keys-buffer))
+    (setq epa-keys-buffer (generate-new-buffer "*Keys*")))
+  (with-current-buffer epa-keys-buffer
     (epa-key-list-mode)
     (let ((inhibit-read-only t)
          buffer-read-only)
@@ -585,7 +584,11 @@ If SECRET is non-nil, list secret keys instead of public keys."
                                      (epg-sub-key-creation-time (car pointer)))
                (error "????-??-??"))
              (if (epg-sub-key-expiration-time (car pointer))
-                 (format "\n\tExpires: %s"
+                 (format (if (time-less-p (current-time)
+                                          (epg-sub-key-expiration-time
+                                           (car pointer)))
+                             "\n\tExpires: %s"
+                           "\n\tExpired: %s")
                          (condition-case nil
                              (format-time-string "%Y-%m-%d"
                                                  (epg-sub-key-expiration-time
@@ -610,8 +613,7 @@ If SECRET is non-nil, list secret keys instead of public keys."
          (setq epa-info-buffer (generate-new-buffer "*Info*")))
        (if (get-buffer-window epa-info-buffer)
            (delete-window (get-buffer-window epa-info-buffer)))
-       (save-excursion
-         (set-buffer epa-info-buffer)
+       (with-current-buffer epa-info-buffer
          (let ((inhibit-read-only t)
                buffer-read-only)
            (erase-buffer)
@@ -630,7 +632,7 @@ If SECRET is non-nil, list secret keys instead of public keys."
 
 (defun epa-display-verify-result (verify-result)
   (epa-display-info (epg-verify-result-to-string verify-result)))
-(make-obsolete 'epa-display-verify-result 'epa-display-info)
+(make-obsolete 'epa-display-verify-result 'epa-display-info "23.1")
 
 (defun epa-passphrase-callback-function (context key-id handback)
   (if (eq key-id 'SYM)
@@ -711,8 +713,7 @@ If SECRET is non-nil, list secret keys instead of public keys."
             (setq type 'detached))
            ((eq c ??)
             (with-output-to-temp-buffer "*Help*"
-              (save-excursion
-                (set-buffer standard-output)
+              (with-current-buffer standard-output
                 (insert "\
 n - Create a normal signature
 c - Create a cleartext signature
@@ -720,7 +721,8 @@ d - Create a detached signature
 ? - Show this help
 "))))
            (t
-            (setq type 'normal))))))
+            (setq type 'normal))))
+    type))
 
 ;;;###autoload
 (defun epa-sign-file (file signers mode)
@@ -824,7 +826,8 @@ For example:
       (setq plain (epa--decode-coding-string
                   plain
                   (or coding-system-for-read
-                      (get-text-property start 'epa-coding-system-used))))
+                      (get-text-property start 'epa-coding-system-used)
+                      'undecided)))
       (if (y-or-n-p "Replace the original text? ")
          (let ((inhibit-read-only t)
                buffer-read-only)
@@ -913,7 +916,8 @@ For example:
     (setq plain (epa--decode-coding-string
                 plain
                 (or coding-system-for-read
-                    (get-text-property start 'epa-coding-system-used))))
+                    (get-text-property start 'epa-coding-system-used)
+                    'undecided)))
     (if (y-or-n-p "Replace the original text? ")
        (let ((inhibit-read-only t)
              buffer-read-only)