X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fpgg-gpg.el;h=5cc48c57b55bda180e98ebcca2fabbdf0eb1b22d;hb=7c5dc1ff98f43a713c1a0739841b339ec2e3083e;hp=293431b7e84ea4cd28202b850449212d409d25da;hpb=dfcac6d9e606d7d55eb006af36d3e95735c9fdc1;p=gnus

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 293431b7e..5cc48c57b 100644
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -122,12 +122,10 @@
 	  (save-excursion
 	    (if (looking-at "\\[GNUPG:] \\([A-Z_]+\\)\\>.*")
 		(let* ((status (match-string 1))
-		       (symbol (intern-soft (concat "pgg-gpg-status-" status)))
-		       (entry (member status pgg-gpg-pending-status-list)))
-		  (if entry
-		      (setq pgg-gpg-pending-status-list
-			    (delq (car entry)
-				  pgg-gpg-pending-status-list)))
+		       (symbol (intern-soft (concat "pgg-gpg-status-"
+						    status))))
+		  (if (member status pgg-gpg-pending-status-list)
+		      (setq pgg-gpg-pending-status-list nil))
 		  (if (and symbol
 			   (fboundp symbol))
 		      (funcall symbol process (buffer-substring
@@ -256,7 +254,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 +301,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