Synch with Gnus trunk.

2009-09-22  Daiki Ueno  <ueno@unixuser.org>

 * mm-encode.el (mm-sign-option, mm-encrypt-option): New user option.
 * mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Let users select
 keys from the menu if mm-{sign,encrypt}-option is 'guided.
 * mml-smime.el (mml-smime-epg-sign, mml-smime-epg-encrypt): Ditto.
 * mml1991.el (mml1991-epg-sign, mml1991-epg-encrypt): Ditto.

2009-09-15  Katsumi Yamaoka  <yamaoka@jpl.org>

 * gnus-art.el (gnus-article-edit-part): Work for the buffer
 configuration that provides the sole article window in a frame;
 position point correctly after deleting a part.

2009-09-14  Adam Sjøgren  <asjo@koldfront.dk>

 * spam.el (spam-unregister-on-reregister): Add boolean variable.
 (spam-resolve-registrations-routine): Use it to unregister articles
 that change status.

7 files changed, 53 insertions, 22 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 541e83ee714..39ec4899fc2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -6,6 +6,14 @@
 	* nnir.el (gnus-summary-nnir-goto-thread, nnir-run-waissearch)
 	(nnir-run-swish++, nnir-run-swish-e): Fix typos in error messages.
 
+2009-09-22  Daiki Ueno  <ueno@unixuser.org>
+
+	* mm-encode.el (mm-sign-option, mm-encrypt-option): New user option.
+	* mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Let users select
+	keys from the menu if mm-{sign,encrypt}-option is 'guided.
+	* mml-smime.el (mml-smime-epg-sign, mml-smime-epg-encrypt): Ditto.
+	* mml1991.el (mml1991-epg-sign, mml1991-epg-encrypt): Ditto.
+
 2009-09-18  Glenn Morris  <rgm@gnu.org>
 
 	* gnus-diary.el (gnus-diary-check-message):
@@ -14,6 +22,18 @@
 	* nndiary.el (nndiary-schedule):
 	Fix typos in condition-case handlers.
 
+2009-09-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (gnus-article-edit-part): Work for the buffer
+	configuration that provides the sole article window in a frame;
+	position point correctly after deleting a part.
+
+2009-09-14  Adam Sjøgren  <asjo@koldfront.dk>
+
+	* spam.el (spam-unregister-on-reregister): Add boolean variable.
+	(spam-resolve-registrations-routine): Use it to unregister articles
+	that change status.
+
 2009-09-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* nnrss.el (nnrss-request-article): Remove binding of
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 226fe33f221..fa13947d7c8 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4862,15 +4862,9 @@ and `gnus-mime-delete-part', and not provided at run-time normally."
 	 ,gnus-summary-buffer no-highlight))
      t)
     (gnus-article-edit-done)
-    (gnus-summary-expand-window)
-    (gnus-summary-show-article)
+    (gnus-configure-windows 'article)
     (when (and current-id (integerp gnus-auto-select-part))
-      (gnus-article-jump-to-part
-       (if (text-property-any (point-min) (point-max)
-			      'gnus-part (+ current-id gnus-auto-select-part))
-	   (+ current-id gnus-auto-select-part)
-	 (with-current-buffer gnus-article-buffer
-	   (length gnus-article-mime-handle-alist)))))))
+      (gnus-article-jump-to-part (+ current-id gnus-auto-select-part)))))
 
 (defun gnus-mime-replace-part (file)
   "Replace MIME part under point with an external body."
diff --git a/lisp/gnus/mm-encode.el b/lisp/gnus/mm-encode.el
index 0d41caaf484..d4f9ea76006 100644
--- a/lisp/gnus/mm-encode.el
+++ b/lisp/gnus/mm-encode.el
@@ -60,6 +60,24 @@ to specify encoding of non-ASCII MIME parts."
 			       (const base64))))
   :group 'mime)
 
+(defcustom mm-sign-option nil
+  "Option how to create signed parts.
+nil, use the default keys without asking;
+`guided', let you select signing keys from the menu."
+  :version "23.1"
+  :type '(choice (item guided)
+		 (item :tag "default" nil))
+  :group 'mime-security)
+
+(defcustom mm-encrypt-option nil
+  "Option how to create encrypted parts.
+nil, use the default keys without asking;
+`guided', let you select recipients' keys from the menu."
+  :version "23.1"
+  :type '(choice (item guided)
+		 (item :tag "default" nil))
+  :group 'mime-security)
+
 (defvar mm-use-ultra-safe-encoding nil
   "If non-nil, use encodings aimed at Procrustean bed survival.
 
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index af4d1bf9363..8aeb56413f9 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -381,7 +381,7 @@ Whether the passphrase is cached at all is controlled by
 	  (or (message-options-get 'mml-smime-epg-signers)
 	      (message-options-set
 	      'mml-smime-epg-signers
-	      (if mml-smime-verbose
+	      (if (eq mm-sign-option 'guided)
 		  (epa-select-keys context "\
 Select keys for signing.
 If no one is selected, default secret key is used.  "
@@ -462,7 +462,7 @@ Content-Disposition: attachment; filename=smime.p7s
 			 (message-options-set 'message-recipients
 					      (read-string "Recipients: ")))
 		     "[ \f\t\n\r\v,]+"))))
-      (if mml-smime-verbose
+      (if (eq mm-encrypt-option 'guided)
 	  (setq recipients
 		(epa-select-keys context "\
 Select recipients for encryption.
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 4536f4183d9..7d4f828f6bf 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -34,6 +34,7 @@
   (require 'cl)
   (require 'mm-util))
 
+(require 'mm-encode)
 (require 'mml-sec)
 
 (defvar mc-pgp-always-sign)
@@ -368,7 +369,7 @@ Whether the passphrase is cached at all is controlled by
 (defun mml1991-epg-sign (cont)
   (let ((context (epg-make-context))
 	headers cte signers signature)
-    (if mml1991-verbose
+    (if (eq mm-sign-option 'guided)
 	(setq signers (epa-select-keys context "Select keys for signing.
 If no one is selected, default secret key is used.  "
 				       mml1991-signers t))
@@ -448,7 +449,7 @@ If no one is selected, default secret key is used.  "
 			       (or (epg-expand-group config recipient)
 				   (list recipient)))
 			     recipients))))
-    (if mml1991-verbose
+    (if (eq mm-encrypt-option 'guided)
 	(setq recipients
 	      (epa-select-keys context "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "
@@ -466,7 +467,7 @@ If no one is selected, symmetric encryption will be performed.  "
 				 mml1991-signers)))
 	  (error "mml1991-signers not set")))
     (when sign
-      (if mml1991-verbose
+      (if (eq mm-sign-option 'guided)
 	  (setq signers (epa-select-keys context "Select keys for signing.
 If no one is selected, default secret key is used.  "
 					 mml1991-signers t))
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 508c51f76c9..d6d06c379e8 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -1187,7 +1187,7 @@ Whether the passphrase is cached at all is controlled by
 	  (or (message-options-get 'mml2015-epg-signers)
 	      (message-options-set
 	       'mml2015-epg-signers
-	       (if mml2015-verbose
+	       (if (eq mm-sign-option 'guided)
 		   (epa-select-keys context "\
 Select keys for signing.
 If no one is selected, default secret key is used.  "
@@ -1269,7 +1269,7 @@ If no one is selected, default secret key is used.  "
 	(unless mml2015-signers
 	  (error "mml2015-signers not set"))
 	(setq recipients (nconc recipients mml2015-signers)))
-      (if mml2015-verbose
+      (if (eq mm-encrypt-option 'guided)
 	  (setq recipients
 		(epa-select-keys context "\
 Select recipients for encryption.
@@ -1297,7 +1297,7 @@ If no one is selected, symmetric encryption will be performed.  "
 	    (or (message-options-get 'mml2015-epg-signers)
 		(message-options-set
 		 'mml2015-epg-signers
-		 (if mml2015-verbose
+		 (if (eq mm-sign-option 'guided)
 		     (epa-select-keys context "\
 Select keys for signing.
 If no one is selected, default secret key is used.  "
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 2d2fafa3fdc..c98fcf6ad17 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -660,12 +660,12 @@ order for SpamAssassin to recognize the new registered spam."
   :type 'string
   :group 'spam-crm114)
 
-(defcustom spam-crm114-spam-strong-switch "--UNKNOWN"
+(defcustom spam-crm114-spam-strong-switch "--unlearn"
   "The switch that CRM114 Mailfilter uses to unregister ham messages."
   :type 'string
   :group 'spam-crm114)
 
-(defcustom spam-crm114-ham-strong-switch "--UNKNOWN"
+(defcustom spam-crm114-ham-strong-switch "--unlearn"
   "The switch that CRM114 Mailfilter uses to unregister spam messages."
   :type 'string
   :group 'spam-crm114)
@@ -1152,10 +1152,8 @@ backends)."
 				  'spam-check-crm114
 				  'spam-crm114-register-ham-routine
 				  'spam-crm114-register-spam-routine
-				  ;; does CRM114 Mailfilter support unregistration?
-				  nil
-				  nil)
-
+				  'spam-crm114-unregister-ham-routine
+				  'spam-crm114-unregister-spam-routine)
 ;;}}}
 
 ;;{{{ scoring and summary formatting