* nnmail.el (nnmail-spool-file): Remove obsolete variable.

(nnmail-get-new-mail): Remove code using `nnmail-spool-file'.

* gnus-start.el (defvar, gnus-get-unread-articles): Remove code using
`nnmail-spool-file'.

* nnkiboze.el (nnkiboze-generate-groups): Don't bind obsolete
`nnmail-spool-file'.

* gnus-move.el (gnus-change-server): Ditto.

* gnus-kill.el (gnus-batch-score): Ditto.

* gnus-cache.el (gnus-jog-cache): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 208be11..dfb2ba1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,20 @@
 2007-11-24  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * nnmail.el (nnmail-spool-file): Remove obsolete variable.
+       (nnmail-get-new-mail): Remove code using `nnmail-spool-file'.
+
+       * gnus-start.el (defvar, gnus-get-unread-articles): Remove code using
+       `nnmail-spool-file'.
+
+       * nnkiboze.el (nnkiboze-generate-groups): Don't bind obsolete
+       `nnmail-spool-file'.
+
+       * gnus-move.el (gnus-change-server): Ditto.
+
+       * gnus-kill.el (gnus-batch-score): Ditto.
+
+       * gnus-cache.el (gnus-jog-cache): Ditto.
+
        * gnus-msg.el (gnus-summary-reply): Ignore
        gnus-confirm-mail-reply-to-news for wide and very wide replies.
 

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index 9b84176..4f61a0f 100644 (file)
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -620,7 +620,6 @@ $ emacs -batch -l ~/.emacs -l gnus -f gnus-jog-cache"
   (interactive)
   (let ((gnus-mark-article-hook nil)
        (gnus-expert-user t)
-       (nnmail-spool-file nil)
        (mail-sources nil)
        (gnus-use-dribble-file nil)
        (gnus-novice-user nil)

diff --git a/lisp/gnus-kill.el b/lisp/gnus-kill.el
index 5778a02..2d64a76 100644 (file)
--- a/lisp/gnus-kill.el
+++ b/lisp/gnus-kill.el
@@ -687,7 +687,6 @@ Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score"
           (concat "options -n "
                   (mapconcat 'identity command-line-args-left " "))))
         (gnus-expert-user t)
-        (nnmail-spool-file nil)
         (mail-sources nil)
         (gnus-use-dribble-file nil)
         (gnus-batch-mode t)

diff --git a/lisp/gnus-move.el b/lisp/gnus-move.el
index 0a97f8d..cf5cde6 100644 (file)
--- a/lisp/gnus-move.el
+++ b/lisp/gnus-move.el
@@ -47,8 +47,7 @@ Update the .newsrc.eld file to reflect the change of nntp server."
 
   ;; First start Gnus.
   (let ((gnus-activate-level 0)
-       (mail-sources nil)
-       (nnmail-spool-file nil))
+       (mail-sources nil))
     (gnus))
 
   (save-excursion

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 93b38fc..144e884 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -663,8 +663,7 @@ the first newsgroup."
   (defvar gnus-current-select-method)
   (defvar mail-sources)
   (defvar nnmail-scan-directory-mail-source-once)
-  (defvar nnmail-split-history)
-  (defvar nnmail-spool-file))
+  (defvar nnmail-split-history))
 
 (defun gnus-close-all-servers ()
   "Close all servers."
@@ -1763,11 +1762,7 @@ If SCAN, request a scan of that group as well."
               ;; not required.
               (if (and
                    (or nnmail-scan-directory-mail-source-once
-                       (null (assq 'directory
-                                   (or mail-sources
-                                       (if (listp nnmail-spool-file)
-                                           nnmail-spool-file
-                                         (list nnmail-spool-file))))))
+                       (null (assq 'directory mail-sources)))
                    (member method scanned-methods))
                   (setq active (gnus-activate-group group))
                 (setq active (gnus-activate-group group 'scan))

diff --git a/lisp/nnkiboze.el b/lisp/nnkiboze.el
index 78e35c4..06acca8 100644 (file)
--- a/lisp/nnkiboze.el
+++ b/lisp/nnkiboze.el
@@ -198,8 +198,7 @@
   "\"Usage: emacs -batch -l nnkiboze -f nnkiboze-generate-groups\".
 Finds out what articles are to be part of the nnkiboze groups."
   (interactive)
-  (let ((nnmail-spool-file nil)
-       (mail-sources nil)
+  (let ((mail-sources nil)
        (gnus-use-dribble-file nil)
        (gnus-read-active-file t)
        (gnus-expert-user t))

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 8ff6d1d..e05c286 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -240,16 +240,11 @@ If non-nil, also update the cache when copy or move articles."
   :group 'nnmail
   :type 'boolean)
 
-(defcustom nnmail-spool-file '((file))
-  "*Where the mail backends will look for incoming mail.
-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
+;; Variable removed in No Gnus v0.7
 
 (defcustom nnmail-resplit-incoming nil
   "*If non-nil, re-split incoming procmail sorted mail."
@@ -1765,10 +1760,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 (defun nnmail-get-new-mail (method exit-func temp
                                   &optional group spool-func)
   "Read new incoming mail."
-  (let* ((sources (or mail-sources
-                     (if (listp nnmail-spool-file)
-                         nnmail-spool-file
-                       (list nnmail-spool-file))))
+  (let* ((sources mail-sources)
         fetching-sources
         (group-in group)
         (i 0)
@@ -1778,20 +1770,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))
-       ;; Be compatible with old values.
-       (cond
-        ((stringp source)
-         (setq source
-               (cond
-                ((string-match "^po:" source)
-                 (list 'pop :user (substring source (match-end 0))))
-                ((file-directory-p source)
-                 (list 'directory :path source))
-                (t
-                 (list 'file :path source)))))
-        ((eq source 'procmail)
-         (message "Invalid value for nnmail-spool-file: `procmail'")
-         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)