[Emacs-diffs] emacs/lisp epg.el ChangeLog

[Daiki Ueno]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Daiki Ueno <ueno>       09/09/23 00:22:15

Modified files:
        lisp           : epg.el ChangeLog 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/epg.el?cvsroot=emacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16237&r2=1.16238

Patches:
Index: epg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epg.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- epg.el      12 Sep 2009 14:58:59 -0000      1.17
+++ epg.el      23 Sep 2009 00:22:08 -0000      1.18
@@ -1187,7 +1187,10 @@
                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."

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16237
retrieving revision 1.16238
diff -u -b -r1.16237 -r1.16238
--- ChangeLog   22 Sep 2009 23:49:10 -0000      1.16237
+++ ChangeLog   23 Sep 2009 00:22:08 -0000      1.16238
@@ -1,3 +1,7 @@
+2009-09-23  Daiki Ueno  <address@hidden>
+
+       * epg.el (epg-wait-for-status): Preserve existing 'error results.
+
 2009-09-22  Sam Steingold  <address@hidden>
 
        * vc-hg.el (vc-hg-print-log): Fix shortlog arg passing.