diff options
| author | Daiki Ueno <ueno@unixuser.org> | 2011-02-02 16:53:29 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@unixuser.org> | 2011-02-02 16:53:29 +0900 |
| commit | 2d871302f49717b9396fcfe34550b69d00551557 (patch) | |
| tree | 897ef4b5aabf8ff7334d5dc060e3047fa1cf88d9 | |
| parent | 15d73a19fc9f52899e803625dc31cbc90c13fba0 (diff) | |
| download | emacs-2d871302f49717b9396fcfe34550b69d00551557.tar.gz | |
Backport Bug#7931 from trunk.
* epg.el (epg--status-KEYEXPIRED, epg--status-KEYREVOKED): Don't
presume KEYEXPIRED and KEYREVOKED to be a fatal error status
(Bug#7931).
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/epg.el | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ead0456a7b1..2159eda340a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -15,6 +15,12 @@ * files.el (copy-directory): Fix arguments to recursive call. +2011-01-29 Daiki Ueno <ueno@unixuser.org> + + * epg.el (epg--status-KEYEXPIRED, epg--status-KEYREVOKED): Don't + presume KEYEXPIRED and KEYREVOKED to be a fatal error status + (Bug#7931). + 2011-01-29 Chong Yidong <cyd@stupidchicken.com> * files.el (copy-directory): If destination is an existing diff --git a/lisp/epg.el b/lisp/epg.el index fdcd0cbdc70..673109b2015 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -1560,14 +1560,14 @@ This function is for internal use only." (defun epg--status-KEYEXPIRED (context string) (epg-context-set-result-for - context 'error + context 'key (cons (list 'key-expired (cons 'expiration-time (epg--time-from-seconds string))) (epg-context-result-for context 'error)))) (defun epg--status-KEYREVOKED (context string) (epg-context-set-result-for - context 'error + context 'key (cons '(key-revoked) (epg-context-result-for context 'error)))) |