(epg-wait-for-status): Preserve existing 'error results.

2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9c47e46f83..17b18166667 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-23  Daiki Ueno  <ueno@unixuser.org>
+
+        * epg.el (epg-wait-for-status): Preserve existing 'error results.
+
 2009-09-22  Sam Steingold  <sds@gnu.org>
 
         * vc-hg.el (vc-hg-print-log): Fix shortlog arg passing.
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."