# HG changeset patch
# User Reiner Steib <Reiner.Steib@gmx.de>
# Date 1175349420 0
# Node ID 9feeb7a817c00ed469541ed5d3d14c66dc0ebfc0
# Parent  e5b96737f9062424046c708160fb0aacc5f5adf3
* nnmail.el (nnmail-spool-file): Mark as obsolete.
(nnmail-get-new-mail): Reformat.

* gnus-registry.el (gnus-registry-cache-save): Add FIXME comment.

* gmm-utils.el: Fix Commentary.
(gmm-tool-bar-from-list): Fix typo in doc string.

diff -r e5b96737f906 -r 9feeb7a817c0 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sat Mar 31 13:56:30 2007 +0000
+++ b/lisp/gnus/ChangeLog	Sat Mar 31 13:57:00 2007 +0000
@@ -1,3 +1,13 @@
+2007-03-31  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* nnmail.el (nnmail-spool-file): Mark as obsolete.
+	(nnmail-get-new-mail): Reformat.
+
+	* gnus-registry.el (gnus-registry-cache-save): Add FIXME comment.
+
+	* gmm-utils.el: Fix Commentary.
+	(gmm-tool-bar-from-list): Fix typo in doc string.
+
 2007-03-27  Thien-Thi Nguyen  <ttn@gnu.org>
 
 	* message.el (message-yank-original): Fix bug:
diff -r e5b96737f906 -r 9feeb7a817c0 lisp/gnus/gmm-utils.el
--- a/lisp/gnus/gmm-utils.el	Sat Mar 31 13:56:30 2007 +0000
+++ b/lisp/gnus/gmm-utils.el	Sat Mar 31 13:57:00 2007 +0000
@@ -26,7 +26,7 @@
 
 ;; This library provides self-contained utility functions.  The functions are
 ;; used in Gnus, Message and MML, but within this library there are no
-;; dependencies on Gnus, Message, or MML or Gnus.
+;; dependencies on Gnus, Message, or MML.
 
 ;;; Code:
 
@@ -217,7 +217,7 @@
 command, the second element is an icon file name and the third
 element is a test function.  You can use \\[describe-key]
 <menu-entry> to find out the name of a menu command.  The fourth
-and all following elements are passed a the PROPS argument to the
+and all following elements are passed as the PROPS argument to the
 function `tool-bar-local-item'.
 
 If ZAP-LIST is a list, remove those item from the default
diff -r e5b96737f906 -r 9feeb7a817c0 lisp/gnus/gnus-registry.el
--- a/lisp/gnus/gnus-registry.el	Sat Mar 31 13:56:30 2007 +0000
+++ b/lisp/gnus/gnus-registry.el	Sat Mar 31 13:57:00 2007 +0000
@@ -154,6 +154,8 @@
       (gnus-load file)
       (gnus-message 5 "Reading %s...done" file))))
 
+;; FIXME: Get rid of duplicated code, cf. `gnus-save-newsrc-file' in
+;; `gnus-start.el'.  --rsteib
 (defun gnus-registry-cache-save ()
   "Save the registry cache file."
   (interactive)
diff -r e5b96737f906 -r 9feeb7a817c0 lisp/gnus/nnmail.el
--- a/lisp/gnus/nnmail.el	Sat Mar 31 13:56:30 2007 +0000
+++ b/lisp/gnus/nnmail.el	Sat Mar 31 13:57:00 2007 +0000
@@ -247,6 +247,10 @@
 This variable is obsolete; `mail-sources' should be used instead."
   :group 'nnmail-files
   :type 'sexp)
+(make-obsolete-variable 'nnmail-spool-file
+			"This option is obsolete in Gnus 5.9.  \
+Use `mail-sources' instead.")
+;; revision 5.29 / p0-85 / Gnus 5.9
 
 (defcustom nnmail-resplit-incoming nil
   "*If non-nil, re-split incoming procmail sorted mail."
@@ -1749,7 +1753,8 @@
 				   &optional group spool-func)
   "Read new incoming mail."
   (let* ((sources (or mail-sources
-		      (if (listp nnmail-spool-file) nnmail-spool-file
+		      (if (listp nnmail-spool-file)
+			  nnmail-spool-file
 			(list nnmail-spool-file))))
 	 fetching-sources
 	 (group-in group)