summaryrefslogtreecommitdiff
path: root/lisp/epg.el
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@unixuser.org>2009-09-23 00:22:08 +0000
committerDaiki Ueno <ueno@unixuser.org>2009-09-23 00:22:08 +0000
commit7bda18ccca8cf97874e93d18cf3136c33e2e9df0 (patch)
tree0ed8c75c7aa0ed9debd40060a12690be43ac56f6 /lisp/epg.el
parent0aa4f295f59c1e4cb3dae225a1ae82759f8953fa (diff)
downloademacs-7bda18ccca8cf97874e93d18cf3136c33e2e9df0.tar.gz
(epg-wait-for-status): Preserve existing 'error results.
Diffstat (limited to 'lisp/epg.el')
-rw-r--r--lisp/epg.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/epg.el b/lisp/epg.el
index d80e966c942..b8eb2b48ea7 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1187,7 +1187,10 @@ This function is for internal use only."
epg-pending-status-list)
(accept-process-output (epg-context-process context) 1))
(if epg-pending-status-list
- (epg-context-set-result-for context 'error 'exit))))
+ (epg-context-set-result-for
+ context 'error
+ (cons (list 'exit)
+ (epg-context-result-for context 'error))))))
(defun epg-wait-for-completion (context)
"Wait until the `epg-gpg-program' process completes."