[Emacs-diffs] /srv/bzr/emacs/trunk r103020: Don't throw an error when any of encryption subkeys are expired.

[Daiki Ueno]

------------------------------------------------------------
revno: 103020
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Sat 2011-01-29 20:05:35 +0900
message:
  Don't throw an error when any of encryption subkeys are expired.
  
  * 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-29 06:08:24 +0000
+++ b/lisp/ChangeLog    2011-01-29 11:05:35 +0000
@@ -1,3 +1,9 @@
+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  Stefan Monnier  <address@hidden>
 
        * progmodes/compile.el: Avoid an N² behavior in grep.

=== modified file 'lisp/epg.el'
--- a/lisp/epg.el       2011-01-25 04:08:28 +0000
+++ b/lisp/epg.el       2011-01-29 11:05:35 +0000
@@ -1561,14 +1561,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))))