* 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.

4 files changed, 20 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6176af67c59..34b51016d8d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index 84b69edb575..9241e96d042 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -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 @@ Within each entry of ICON-LIST, the first element is a menu
 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 --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index f32ed6f1414..3e4d3d0127c 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -154,6 +154,8 @@ way."
       (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 --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 736e58cd5a2..b080088b2ef 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -247,6 +247,10 @@ This variable is a list of mail source specifiers.
 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 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
                                    &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)