diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/pgg-gpg.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9397101c432..f94a9fd6ce5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-04-05 Daiki Ueno <ueno@unixuser.org> + + * pgg-gpg.el (pgg-gpg-encrypt-region, pgg-gpg-sign-region): Wait + for BEGIN_SIGNING too, new in GnuPG 1.4.3. + 2006-04-05 Kenichi Handa <handa@m17n.org> * international/characters.el: Setup cases of Latin, Greek, and diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el index 293431b7e84..d8ceeabc25f 100644 --- a/lisp/pgg-gpg.el +++ b/lisp/pgg-gpg.el @@ -256,7 +256,7 @@ If optional argument SIGN is non-nil, do a combined sign and encrypt." (list pgg-gpg-user-id)))))))) (process (pgg-gpg-start-process args))) (if (and sign (not pgg-gpg-use-agent)) - (pgg-gpg-wait-for-status process '("GOOD_PASSPHRASE"))) + (pgg-gpg-wait-for-status process '("BEGIN_SIGNING" "GOOD_PASSPHRASE"))) (process-send-region process start end) (pgg-gpg-wait-for-completion process) (save-excursion @@ -303,7 +303,7 @@ If optional argument SIGN is non-nil, do a combined sign and encrypt." (if pgg-text-mode '("--textmode")))) (process (pgg-gpg-start-process args))) (unless pgg-gpg-use-agent - (pgg-gpg-wait-for-status process '("GOOD_PASSPHRASE"))) + (pgg-gpg-wait-for-status process '("BEGIN_SIGNING" "GOOD_PASSPHRASE"))) (process-send-region process start end) (pgg-gpg-wait-for-completion process) (save-excursion |