Commit 2d871302 authored by Daiki Ueno's avatar Daiki Ueno
Browse files

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).
parent 15d73a19
...@@ -15,6 +15,12 @@ ...@@ -15,6 +15,12 @@
* files.el (copy-directory): Fix arguments to recursive call. * 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> 2011-01-29 Chong Yidong <cyd@stupidchicken.com>
* files.el (copy-directory): If destination is an existing * files.el (copy-directory): If destination is an existing
......
...@@ -1560,14 +1560,14 @@ This function is for internal use only." ...@@ -1560,14 +1560,14 @@ This function is for internal use only."
(defun epg--status-KEYEXPIRED (context string) (defun epg--status-KEYEXPIRED (context string)
(epg-context-set-result-for (epg-context-set-result-for
context 'error context 'key
(cons (list 'key-expired (cons 'expiration-time (cons (list 'key-expired (cons 'expiration-time
(epg--time-from-seconds string))) (epg--time-from-seconds string)))
(epg-context-result-for context 'error)))) (epg-context-result-for context 'error))))
(defun epg--status-KEYREVOKED (context string) (defun epg--status-KEYREVOKED (context string)
(epg-context-set-result-for (epg-context-set-result-for
context 'error context 'key
(cons '(key-revoked) (cons '(key-revoked)
(epg-context-result-for context 'error)))) (epg-context-result-for context 'error))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment