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).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ead0456a7b1e56d8a9eadd07143f4e0a04bfb54b..2159eda340ac4de4fedf81861392af5e9417fe69 100644 (file)
--- 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 fdcd0cbdc70e07b41ea18a7bb211ba5f78face0c..673109b20150ad8c9ba2a832c0ab19cb0c5460e8 100644 (file)
--- 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))))