diff options
| -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 1b833abe3cf..9ca1dd55250 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +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 Stefan Monnier <monnier@iro.umontreal.ca> * progmodes/compile.el: Avoid an N² behavior in grep. diff --git a/lisp/epg.el b/lisp/epg.el index e0eb14a8f3d..c096ec6df98 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -1561,14 +1561,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)))) |