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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80b2f5d..c0808dc 100644 (file)
--- 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-04  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
        * nnweb.el (nnweb-google-create-mapping): Update regexp.  Some

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 293431b..d8ceeab 100644 (file)
--- 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