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

lisp/ChangeLog

+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.

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."