From: yamaoka <yamaoka>
Date: Sat, 27 Nov 2004 01:02:02 +0000 (+0000)
Subject: Synch to No Gnus 200411261413.
X-Git-Tag: t-gnus-6_17_4-quimby-~654
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c253edbc59e310e7dacf5f73551e88118dfae3f0;p=elisp%2Fgnus.git-

Synch to No Gnus 200411261413.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b209a11..c6bbdde 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-26  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus-art.el (gnus-split-methods): reformat comments
+
+	* spam.el (spam-summary-prepare-exit): remove article limits
+	before exiting the summary buffer
+
 2004-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* lpath.el: Remove bbdb-create-internal, bbdb-records,
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 46b78c9..1c00409 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -601,17 +601,19 @@ you could set this variable to something like:
  '((\"^Subject:.*gnus\\|^Newsgroups:.*gnus\" \"gnus-stuff\")
    (\"^Subject:.*vm\\|^Xref:.*vm\" \"vm-stuff\"))
 
-This variable is an alist where the where the key is the match and the
-value is a list of possible files to save in if the match is non-nil.
+This variable is an alist where the key is the match and the
+value is a list of possible files to save in if the match is
+non-nil.
 
 If the match is a string, it is used as a regexp match on the
 article.  If the match is a symbol, that symbol will be funcalled
-from the buffer of the article to be saved with the newsgroup as the
-parameter.  If it is a list, it will be evaled in the same buffer.
+from the buffer of the article to be saved with the newsgroup as
+the parameter.  If it is a list, it will be evaled in the same
+buffer.
 
-If this form or function returns a string, this string will be used as
-a possible file name; and if it returns a non-nil list, that list will
-be used as possible file names."
+If this form or function returns a string, this string will be
+used as a possible file name; and if it returns a non-nil list,
+that list will be used as possible file names."
   :group 'gnus-article-saving
   :type '(repeat (choice (list :value (fun) function)
 			 (cons :value ("" "") regexp (repeat string))
diff --git a/lisp/spam.el b/lisp/spam.el
index 484ad14..527eaf2 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -1315,6 +1315,10 @@ addition to the set values for the group."
   (unless gnus-group-is-exiting-without-update-p
     (gnus-message 6 "Exiting summary buffer and applying spam rules")
 
+    ;; before we begin, remove any article limits
+    (ignore-errors
+      (universal-argument (gnus-summary-pop-limit)))
+
     ;; first of all, unregister any articles that are no longer ham or spam
     ;; we have to iterate over the processors, or else we'll be too slow
     (dolist (classification (spam-classifications))