;;; epa.el --- the EasyPG Assistant
-;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Keywords: PGP, GnuPG
: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))
(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
(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)
? - Show this help
"))))
(t
- (setq type 'normal))))))
+ (setq type 'normal))))
+ type))
;;;###autoload
(defun epa-sign-file (file signers mode)
(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)
(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)