Merge from gnus--devo--0

Revision: [email protected]/emacs--devo--0--patch-1073

12 files changed, 162 insertions, 65 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 6b33931ca8..b5707fc5e8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-24  Katsumi Yamaoka  <[email protected]>
+
+	* gnus-news.texi: Mention that spaces and tabs are allowed in the
+	installation directory name.
+
 2008-02-12  Romain Francoise  <[email protected]>
 
 	* epa.texi (Overview): Fix typo.
diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi
index 8fcab4fc71..9180b7507c 100644
--- a/doc/misc/gnus-news.texi
+++ b/doc/misc/gnus-news.texi
@@ -38,6 +38,8 @@ the new installer issues a warning if other Gnus installations which
 will shadow the latest one are detected.  You can then remove those
 shadows manually or remove them using @code{make
 remove-installed-shadows}.
+
+@item The installation directory name is allowed to have spaces and/or tabs.
 @end itemize
 
 @item New packages and libraries within Gnus
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index 5e41dd0bc4..b294643c75 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -1,7 +1,7 @@
 GNUS NEWS -- history of user-visible changes.
 
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008 Free Software Foundation, Inc.
+   2006, 2007, 2008  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Gnus bug reports to [email protected].
@@ -27,6 +27,8 @@ installer issues a warning if other Gnus installations which will shadow
 the latest one are detected.  You can then remove those shadows manually
 or remove them using `make remove-installed-shadows'.
 
+** The installation directory name is allowed to have spaces and/or tabs.
+
 
 * New packages and libraries within Gnus
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 047b0cfafc..8b65a32aed 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,34 @@
+2008-02-16  Reiner Steib  <[email protected]>
+
+	* mail-source.el (mail-source-delete-incoming): Change default.
+	Supplement doc string.
+
+	* gnus-util.el (gnus-y-or-n-p, gnus-y-or-n-p): Update comments.
+
+2008-02-14  Reiner Steib  <[email protected]>
+
+	* nnmail.el (nnmail-message-id-cache-file): Derive from
+	`gnus-home-directory'.
+
+2008-02-11  Reiner Steib  <[email protected]>
+
+	* gnus-topic.el (gnus-topic-select-group, gnus-topic-read-group):
+	Document negativ prefix.
+
+	* gnus-group.el (gnus-group-read-group): Document negativ prefix.
+
+2008-02-10  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* message.el (message-unsent-separator): Add the Exim bounce
+	separator.
+
+2008-02-10  Daiki Ueno  <[email protected]>
+
+	* mml2015.el (mml2015-epg-sign): Remove skipped signers from the signer
+	list.
+	(mml2015-epg-encrypt): Remove skipped recipients/signers from the
+	recipient/signer list.
+
 2008-02-10  Reiner Steib  <[email protected]>
 
 	* mm-util.el (mm-codepage-setup): If cp-supported-codepages isn't
@@ -7,6 +38,12 @@
 
 	* gnus-art.el (pgg-display-output-buffer): Declare as function.
 
+2008-02-07  Tassilo Horn  <[email protected]>
+
+	* nnimap.el (nnimap-open-connection): Add "143" and "993" as default
+	ports to the calls to `netrc-machine-user-or-password' in addition to
+	"imap" and "imaps".
+
 2008-02-03  Reiner Steib  <[email protected]>
 
 	* gnus.el (gnus-group-startup-message): Add `find-image' call before
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index ee5068e980..ef64fc81b0 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2055,10 +2055,15 @@ and with point over the group in question."
 (defun gnus-group-read-group (&optional all no-article group select-articles)
   "Read news in this newsgroup.
 If the prefix argument ALL is non-nil, already read articles become
-readable.  IF ALL is a number, fetch this number of articles.  If the
-optional argument NO-ARTICLE is non-nil, no article will be
-auto-selected upon group entry.  If GROUP is non-nil, fetch that
-group."
+readable.
+
+If ALL is a positive number, fetch this number of the latest
+articles in the group.  If ALL is a negative number, fetch this
+number of the earliest articles in the group.
+
+If the optional argument NO-ARTICLE is non-nil, no article will
+be auto-selected upon group entry.  If GROUP is non-nil, fetch
+that group."
   (interactive "P")
   (let ((no-display (eq all 0))
 	(group (or group (gnus-group-group-name)))
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index a400474d84..92f4ca0310 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -1193,7 +1193,10 @@ articles in the topic and its subtopics."
 No article is selected automatically.
 If the group is opened, just switch the summary buffer.
 If ALL is non-nil, already read articles become readable.
-If ALL is a number, fetch this number of articles.
+
+If ALL is a positive number, fetch this number of the latest
+articles in the group.  If ALL is a negative number, fetch this
+number of the earliest articles in the group.
 
 If performed over a topic line, toggle folding the topic."
   (interactive "P")
@@ -1245,10 +1248,15 @@ Also see `gnus-group-catchup'."
 (defun gnus-topic-read-group (&optional all no-article group)
   "Read news in this newsgroup.
 If the prefix argument ALL is non-nil, already read articles become
-readable.  IF ALL is a number, fetch this number of articles.  If the
-optional argument NO-ARTICLE is non-nil, no article will be
-auto-selected upon group entry.  If GROUP is non-nil, fetch that
-group.
+readable.
+
+If ALL is a positive number, fetch this number of the latest
+articles in the group.  If ALL is a negative number, fetch this
+number of the earliest articles in the group.
+
+If the optional argument NO-ARTICLE is non-nil, no article will
+be auto-selected upon group entry.  If GROUP is non-nil, fetch
+that group.
 
 If performed over a topic line, toggle folding the topic."
   (interactive "P")
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index d5455760be..6a82960973 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -338,11 +338,43 @@ Symbols are also allowed; their print names are used instead."
 ;; Two silly functions to ensure that all `y-or-n-p' questions clear
 ;; the echo area.
 ;;
-;; Do we really need these aliases?  Workarounds for bugs in the corresponding
-;; Emacs functions?  Maybe these bug are no longer present in any supported
+;; Do we really need these functions?  Workarounds for bugs in the corresponding
+;; Emacs functions?  Maybe these bugs are no longer present in any supported
 ;; (X)Emacs version?  Alias them to the original functions and see if anyone
-;; reports a problem.  If not, replace with original functions.  --rsteib
+;; reports a problem.  If not, replace with original functions.  --rsteib,
+;; 2007-12-14
 ;;
+;; All supported Emacsen clear the echo area after `yes-or-no-p', so we can
+;; remove `yes-or-no-p'.  RMS says that not clearing after `y-or-n-p' is
+;; intentional (see below), so we could remove `gnus-y-or-n-p' too.
+;; Objections?  --rsteib, 2008-02-16
+;;
+;; ,----[ http://thread.gmane.org/gmane.emacs.gnus.general/65099/focus=66070 ]
+;; | From: Richard Stallman
+;; | Subject: Re: Do we need gnus-yes-or-no-p and gnus-y-or-n-p?
+;; | To: Katsumi Yamaoka [...]
+;; | Cc: emacs-devel@[...], xemacs-beta@[...], ding@[...]
+;; | Date: Mon, 07 Jan 2008 12:16:05 -0500
+;; | Message-ID: <[email protected]>
+;; |
+;; |     The behavior of `y-or-n-p' that it doesn't clear the question
+;; |     and the answer is not serious of course, but I feel it is not
+;; |     cool.
+;; |
+;; | It is intentional.
+;; |
+;; |     Currently, it is commented out in the trunk by Reiner Steib.  He
+;; |     also wrote the benefit of leaving the question and the answer in
+;; |     the echo area as follows:
+;; |
+;; |     (http://article.gmane.org/gmane.emacs.gnus.general/66061)
+;; |     > In contrast to yes-or-no-p it is much easier to type y, n,
+;; |     > SPC, DEL, etc accidentally, so it might be useful for the user
+;; |     > to see what he has typed.
+;; |
+;; | Yes, that is the reason.
+;; `----
+
 ;; (defun gnus-y-or-n-p (prompt)
 ;;   (prog1
 ;;       (y-or-n-p prompt)
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 01463c5562..cfbcc166b5 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -286,16 +286,19 @@ If non-nil, this maildrop will be checked periodically for new mail."
   :group 'mail-source
   :type 'integer)
 
-(defcustom mail-source-delete-incoming nil
-  "*If non-nil, delete incoming files after handling.
+(defcustom mail-source-delete-incoming
+  10 ;; development versions
+  ;; 2 ;; released versions
+  "If non-nil, delete incoming files after handling.
 If t, delete immediately, if nil, never delete.  If a positive number, delete
-files older than number of days."
-  ;; Note: The removing happens in `mail-source-callback', i.e. no old
-  ;; incoming files will be deleted, unless you receive new mail.
-  ;;
-  ;; You may also set this to `nil' and call `mail-source-delete-old-incoming'
-  ;; from a hook or interactively.
+files older than number of days.
+
+Removing of old files happens in `mail-source-callback', i.e. no
+old incoming files will be deleted unless you receive new mail.
+You may also set this variable to nil and call
+`mail-source-delete-old-incoming' interactively."
   :group 'mail-source
+  :version "22.2" ;; No Gnus / Gnus 5.10.10 (default changed)
   :type '(choice (const :tag "immediately" t)
 		 (const :tag "never" nil)
 		 (integer :tag "days")))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 273d1c4ec5..a25841df32 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1722,6 +1722,7 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
 	  "^ *--+ +begin message +--+ *$\\|"
 	  "^ *---+ +Original message follows +---+ *$\\|"
 	  "^ *---+ +Undelivered message follows +---+ *$\\|"
+	  "^------ This is a copy of the message, including all the headers. ------ *$\\|"
 	  "^|? *---+ +Message text follows: +---+ *|?$")
   "A regexp that matches the separator before the text of a failed message.")
 
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 1b1ba0d855..b4d301190d 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -1186,18 +1186,20 @@ Select keys for signing.
 If no one is selected, default secret key is used.  "
 				    mml2015-signers t)
 		 (if mml2015-signers
-		     (mapcar
-		      (lambda (signer)
-			(setq signer-key (mml2015-epg-find-usable-key
-					  (epg-list-keys context signer t)
-					  'sign))
-			(unless (or signer-key
-				    (y-or-n-p
-				     (format "No secret key for %s; skip it? "
-					     signer)))
-			  (error "No secret key for %s" signer))
-			signer-key)
-		      mml2015-signers))))))
+		     (delq nil
+			   (mapcar
+			    (lambda (signer)
+			      (setq signer-key (mml2015-epg-find-usable-key
+						(epg-list-keys context signer t)
+						'sign))
+			      (unless (or signer-key
+					  (y-or-n-p
+					   (format
+					    "No secret key for %s; skip it? "
+					    signer)))
+				(error "No secret key for %s" signer))
+			      signer-key)
+			    mml2015-signers)))))))
 	 signature micalg)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)
@@ -1267,18 +1269,19 @@ Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "
 				 recipients))
 	(setq recipients
-	      (mapcar
-	       (lambda (recipient)
-		 (setq recipient-key (mml2015-epg-find-usable-key
-				      (epg-list-keys context recipient)
-				      'encrypt))
-		 (unless (or recipient-key
-			     (y-or-n-p
-			      (format "No public key for %s; skip it? "
-				      recipient)))
-		   (error "No public key for %s" recipient))
-		 recipient-key)
-	       recipients))
+	      (delq nil
+		    (mapcar
+		     (lambda (recipient)
+		       (setq recipient-key (mml2015-epg-find-usable-key
+					    (epg-list-keys context recipient)
+					    'encrypt))
+		       (unless (or recipient-key
+				   (y-or-n-p
+				    (format "No public key for %s; skip it? "
+					    recipient)))
+			 (error "No public key for %s" recipient))
+		       recipient-key)
+		     recipients)))
 	(unless recipients
 	  (error "No recipient specified")))
       (message-options-set 'mml2015-epg-recipients recipients))
@@ -1293,19 +1296,20 @@ Select keys for signing.
 If no one is selected, default secret key is used.  "
 				      mml2015-signers t)
 		   (if mml2015-signers
-		       (mapcar
-			(lambda (signer)
-			  (setq signer-key (mml2015-epg-find-usable-key
-					    (epg-list-keys context signer t)
-					    'sign))
-			  (unless (or signer-key
-				      (y-or-n-p
-				       (format
-					"No secret key for %s; skip it? "
-					signer)))
-			    (error "No secret key for %s" signer))
-			  signer-key)
-			mml2015-signers))))))
+		       (delq nil
+			     (mapcar
+			      (lambda (signer)
+				(setq signer-key (mml2015-epg-find-usable-key
+						  (epg-list-keys context signer t)
+						  'sign))
+				(unless (or signer-key
+					    (y-or-n-p
+					     (format
+					      "No secret key for %s; skip it? "
+					      signer)))
+				  (error "No secret key for %s" signer))
+				signer-key)
+			      mml2015-signers)))))))
       (epg-context-set-signers context signers))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index e1b12650a6..c1b7b888e9 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -802,7 +802,7 @@ If EXAMINE is non-nil the group is selected read-only."
 			(or nnimap-server-address
 			    nnimap-address))
 		  (list port)
-		  (list "imap" "imaps")))
+		  (list "imap" "imaps" "143" "993")))
 	   (passwd (netrc-machine-user-or-password
 		    "password"
 		    list
@@ -810,7 +810,7 @@ If EXAMINE is non-nil the group is selected read-only."
 			  (or nnimap-server-address
 			      nnimap-address))
 		    (list port)
-		    (list "imap" "imaps"))))
+		    (list "imap" "imaps" "143" "993"))))
       (if (imap-authenticate user passwd nnimap-server-buffer)
 	  (prog2
 	      (setq nnimap-server-buffer-alist
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index a6ed719035..08e4fcf05f 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -534,8 +534,9 @@ performed."
   :type '(choice (const :tag "disable" nil)
 		 (integer :format "%v")))
 
-(defcustom nnmail-message-id-cache-file "~/.nnmail-cache"
-  "*The file name of the nnmail Message-ID cache."
+(defcustom nnmail-message-id-cache-file
+  (nnheader-concat gnus-home-directory ".nnmail-cache")
+  "The file name of the nnmail Message-ID cache."
   :group 'nnmail-duplicate
   :group 'nnmail-files
   :type 'file)
@@ -1772,7 +1773,6 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 
 (defun nnmail-get-new-mail-1 (method exit-func temp
 			      group in-group spool-func)
-
   (let* ((sources mail-sources)
 	 fetching-sources
 	 (i 0)
@@ -1782,7 +1782,6 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
     (when (and (nnmail-get-value "%s-get-new-mail" method)
 	       sources)
       (while (setq source (pop sources))
-
 	;; Use group's parameter
 	(when (eq (car source) 'group)
 	  (let ((mail-sources
@@ -1793,7 +1792,6 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 	    (nnmail-get-new-mail-1 method exit-func temp
 				   group group spool-func))
 	  (setq source nil))
-	  
 	;; Hack to only fetch the contents of a single group's spool file.
 	(when (and (eq (car source) 'directory)
 		   (null nnmail-scan-directory-mail-source-once)