[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100443: Backport Bug#7931 from trunk.

[Daiki Ueno]

------------------------------------------------------------
revno: 100443
committer: Daiki Ueno <address@hidden>
branch nick: emacs-23
timestamp: Wed 2011-02-02 16:53:29 +0900
message:
  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).
modified:
  lisp/ChangeLog
  lisp/epg.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-31 23:11:29 +0000
+++ b/lisp/ChangeLog    2011-02-02 07:53:29 +0000
@@ -15,6 +15,12 @@
 
        * files.el (copy-directory): Fix arguments to recursive call.
 
+2011-01-29  Daiki Ueno  <address@hidden>
+
+       * 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  <address@hidden>
 
        * files.el (copy-directory): If destination is an existing

=== modified file 'lisp/epg.el'
--- a/lisp/epg.el       2011-01-02 23:50:46 +0000
+++ b/lisp/epg.el       2011-02-02 07:53:29 +0000
@@ -1560,14 +1560,14 @@
 
 (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))))