2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 290b6b227e0..744823b1006 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-27  Daiki Ueno  <ueno@unixuser.org>
+
+        * epg.el (epg-wait-for-status): Check if there is no pending
+        status.
+        Reported by Ted Romer <ted@romerfamily.com>.
+
 2008-09-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * startup.el (command-line): Turn on menu-bar-mode and
diff --git a/lisp/epg.el b/lisp/epg.el
index 75a860933cb..060dc5ce98d 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1168,7 +1168,9 @@ This function is for internal use only."
     (setq epg-pending-status-list status-list)
     (while (and (eq (process-status (epg-context-process context)) 'run)
                 epg-pending-status-list)
-      (accept-process-output (epg-context-process context) 1))))
+      (accept-process-output (epg-context-process context) 1))
+    (if epg-pending-status-list
+        (epg-context-set-result-for context 'error 'exit))))
 
 (defun epg-wait-for-completion (context)
   "Wait until the `epg-gpg-program' process completes."