Mercurial > emacs
changeset 105152:677719c71dbc
(epg-wait-for-status): Preserve existing 'error results.
| author | Daiki Ueno <ueno@unixuser.org> |
|---|---|
| date | Wed, 23 Sep 2009 00:22:08 +0000 |
| parents | 09e3118c4c13 |
| children | fd551d987ca7 |
| files | lisp/ChangeLog lisp/epg.el |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Sep 22 23:49:10 2009 +0000 +++ b/lisp/ChangeLog Wed Sep 23 00:22:08 2009 +0000 @@ -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.
--- a/lisp/epg.el Tue Sep 22 23:49:10 2009 +0000 +++ b/lisp/epg.el Wed Sep 23 00:22:08 2009 +0000 @@ -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."