From 2d871302f49717b9396fcfe34550b69d00551557 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 2 Feb 2011 16:53:29 +0900 Subject: [PATCH] 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). --- lisp/ChangeLog | 6 ++++++ lisp/epg.el | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ead0456a7b1..2159eda340a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -15,6 +15,12 @@ * files.el (copy-directory): Fix arguments to recursive call. +2011-01-29 Daiki Ueno + + * 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 * files.el (copy-directory): If destination is an existing diff --git a/lisp/epg.el b/lisp/epg.el index fdcd0cbdc70..673109b2015 100644 --- 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)))) -- 2.11.4.GIT