Synched with Gnus 5.2.31.

13 files changed, 411 insertions, 328 deletions

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index b478acce0f2..d44c4949d15 100644
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -66,7 +66,10 @@ variable to \"^nnml\".")
 
 (defun gnus-cache-open ()
   "Initialize the cache."
-  (gnus-cache-read-active))
+  (when (or (file-exists-p gnus-cache-directory)
+            (and gnus-use-cache
+                 (not (eq gnus-use-cache 'passive))))
+    (gnus-cache-read-active)))
 
 (gnus-add-shutdown 'gnus-cache-close 'gnus)
 
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 5d1778e7aa5..53e915af4c2 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -55,20 +55,6 @@ message in, you can set this variable to a function that checks the
 current newsgroup name and then returns a suitable group name (or list
 of names).")
 
-(defvar gnus-message-archive-group
-  '((if (message-news-p) "misc-news" "misc-mail"))
-  "*Name of the group in which to save the messages you've written.
-This can either be a string, a list of strings; or an alist
-of regexps/functions/forms to be evaluated to return a string (or a list
-of strings).  The functions are called with the name of the current
-group (or nil) as a parameter.
-
-Normally the group names returned by this variable should be
-unprefixed -- which implictly means \"store on the archive server\".
-However, you may wish to store the message on some other server.  In
-that case, just return a fully prefixed name of the group --
-\"nnml+private:mail.misc\", for instance.")
-
 (defvar gnus-mailing-list-groups nil
   "*Regexp matching groups that are really mailing lists.
 This is useful when you're reading a mailing list that has been
@@ -668,10 +654,9 @@ If YANK is non-nil, include the original article."
           (save-excursion (re-search-backward "[ \t\n]" nil t) (1+ (point)))
           (save-excursion (re-search-forward "[ \t\n]" nil t) (1- (point))))))
     (when address
-      (switch-to-buffer gnus-summary-buffer)
       (message-reply address)
       (when yank
-        (gnus-inews-yank-articles yank)))))
+        (gnus-inews-yank-articles (list (cdr gnus-article-current)))))))
 
 (defun gnus-bug ()
   "Send a bug report to the Gnus maintainers."
diff --git a/lisp/gnus-nocem.el b/lisp/gnus-nocem.el
index d73cf3382fd..89f27773b8c 100644
--- a/lisp/gnus-nocem.el
+++ b/lisp/gnus-nocem.el
@@ -139,6 +139,7 @@ isn't bound, the message will be used unconditionally.")
                (nnmail-time-since (nnmail-date-to-time date))
                (nnmail-days-to-time gnus-nocem-expiry-wait)))
       (gnus-request-article-this-buffer (mail-header-number header) group)
+      (goto-char (point-min))
       ;; The article has to have proper NoCeM headers.
       (when (and (setq b (search-forward "\n@@BEGIN NCM HEADERS\n" nil t))
                  (setq e (search-forward "\n@@BEGIN NCM BODY\n" nil t)))
diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index c0686ef6903..523fa13587f 100644
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -551,7 +551,7 @@ If optional argument `SILENT' is nil, show effect of score entry."
         ((eq type 'f)
          (setq match (gnus-simplify-subject-fuzzy match))))
   (let ((score (gnus-score-default score))
-        (header (downcase header))
+        (header (format "%s" (downcase header)))
         new)
     (and prompt (setq match (read-string 
                              (format "Match %s on %s, %s: " 
@@ -566,6 +566,9 @@ If optional argument `SILENT' is nil, show effect of score entry."
                                  (int-to-string match)
                                match))))
 
+    ;; Get rid of string props.
+    (setq match (format "%s" match))
+
     ;; If this is an integer comparison, we transform from string to int. 
     (and (eq (nth 2 (assoc header gnus-header-index)) 'gnus-score-integer)
          (setq match (string-to-int match)))
@@ -720,11 +723,11 @@ SCORE is the score to add."
   (setq score (gnus-score-default score))
   (when (gnus-buffer-live-p gnus-summary-buffer)
     (save-excursion
-      (set-buffer gnus-summary-buffer)
       (save-restriction
         (goto-char (point-min))
         (let ((id (mail-fetch-field "message-id")))
           (when id
+            (set-buffer gnus-summary-buffer)
             (gnus-summary-score-entry
              "references" (concat id "[ \t]*$") 'r
              score (current-time-string) nil t)))))))
@@ -735,11 +738,11 @@ SCORE is the score to add."
   (setq score (gnus-score-default score))
   (when (gnus-buffer-live-p gnus-summary-buffer)
     (save-excursion
-      (set-buffer gnus-summary-buffer)
       (save-restriction
         (goto-char (point-min))
         (let ((id (mail-fetch-field "message-id")))
           (when id
+            (set-buffer gnus-summary-buffer)
             (gnus-summary-score-entry
              "references" id 's
              score (current-time-string))))))))
diff --git a/lisp/message.el b/lisp/message.el
index 0e94d64b402..20142f1728a 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -40,7 +40,6 @@
     (require 'mail-abbrevs)
   (require 'mailabbrev))
 
-;;;###autoload
 (defvar message-directory "~/Mail/"
   "*Directory from which all other mail file variables are derived.")
 
@@ -164,9 +163,8 @@ If t, use `message-user-organization-file'.")
 (defvar message-user-organization-file "/usr/lib/news/organization"
   "*Local news organization file.")
 
-;;;###autoload
-(defvar message-autosave-directory
-  (concat (file-name-as-directory message-directory) "drafts/")
+(defvar message-autosave-directory "~/"
+  ; (concat (file-name-as-directory message-directory) "drafts/")
   "*Directory where message autosaves buffers.
 If nil, message won't autosave.")
 
@@ -1095,6 +1093,8 @@ Puts point before the text and mark after.
 Normally indents each nonblank line ARG spaces (default 3).  However,
 if `message-yank-prefix' is non-nil, insert that prefix on each line.
 
+This function uses `message-cite-function' to do the actual citing.
+
 Just \\[universal-argument] as argument means don't indent, insert no
 prefix, and don't delete any headers."
   (interactive "P")
@@ -1531,8 +1531,9 @@ the user from the mailer."
         ;; Check "Shoot me".
         (or (message-check-element 'shoot)
             (save-excursion
-              (if (search-forward
-                   ".i-have-a-misconfigured-system-so-shoot-me" nil t)
+              (if (re-search-forward
+                   "Message-ID.*.i-have-a-misconfigured-system-so-shoot-me"
+                   nil t)
                   (y-or-n-p
                    "You appear to have a misconfigured system.  Really post? ")
                 t)))
@@ -2489,7 +2490,9 @@ Headers already prepared in the buffer are not modified."
                     follow-to)))))
       (widen))
 
-    (message-pop-to-buffer (message-buffer-name "reply" from))
+    (message-pop-to-buffer (message-buffer-name
+                            (if wide "wide reply" "reply") from
+                            (if wide to-address nil)))
 
     (setq message-reply-headers
           (vector 0 subject from date message-id references 0 0 ""))
diff --git a/lisp/nnbabyl.el b/lisp/nnbabyl.el
index 0d9ad2c1e09..330fe905744 100644
--- a/lisp/nnbabyl.el
+++ b/lisp/nnbabyl.el
@@ -1,5 +1,5 @@
 ;;; nnbabyl.el --- rmail mbox access for Gnus
-;; Copyright (C) 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;;      Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -18,8 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
@@ -31,17 +32,21 @@
 (require 'nnheader)
 (require 'rmail)
 (require 'nnmail)
+(require 'nnoo)
+(eval-when-compile (require 'cl))
 
-(defvar nnbabyl-mbox-file (expand-file-name "~/RMAIL")
+(nnoo-declare nnbabyl)
+
+(defvoo nnbabyl-mbox-file (expand-file-name "~/RMAIL")
   "The name of the rmail box file in the users home directory.")
 
-(defvar nnbabyl-active-file (expand-file-name "~/.rmail-active")
+(defvoo nnbabyl-active-file (expand-file-name "~/.rmail-active")
   "The name of the active file for the rmail box.")
 
-(defvar nnbabyl-get-new-mail t
+(defvoo nnbabyl-get-new-mail t
   "If non-nil, nnbabyl will check the incoming mail file and split the mail.")
 
-(defvar nnbabyl-prepare-save-mail-hook nil
+(defvoo nnbabyl-prepare-save-mail-hook nil
   "Hook run narrowed to an article before saving.")
 
 
@@ -51,223 +56,219 @@
 (defconst nnbabyl-version "nnbabyl 1.0"
   "nnbabyl version.")
 
-(defvar nnbabyl-mbox-buffer nil)
-(defvar nnbabyl-current-group nil)
-(defvar nnbabyl-status-string "")
-(defvar nnbabyl-group-alist nil)
-(defvar nnbabyl-active-timestamp nil)
+(defvoo nnbabyl-mbox-buffer nil)
+(defvoo nnbabyl-current-group nil)
+(defvoo nnbabyl-status-string "")
+(defvoo nnbabyl-group-alist nil)
+(defvoo nnbabyl-active-timestamp nil)
 
-
+(defvoo nnbabyl-previous-buffer-mode nil)
 
-(defvar nnbabyl-current-server nil)
-(defvar nnbabyl-server-alist nil)
-(defvar nnbabyl-server-variables 
-  (list
-   (list 'nnbabyl-mbox-file nnbabyl-mbox-file)
-   (list 'nnbabyl-active-file nnbabyl-active-file)
-   (list 'nnbabyl-get-new-mail nnbabyl-get-new-mail)
-   '(nnbabyl-current-group nil)
-   '(nnbabyl-status-string "")
-   '(nnbabyl-group-alist nil)))
+(eval-and-compile
+  (autoload 'gnus-set-text-properties "gnus-ems"))
 
 
 
 ;;; Interface functions
 
-(defun nnbabyl-retrieve-headers (sequence &optional newsgroup server)
+(nnoo-define-basics nnbabyl)
+
+(deffoo nnbabyl-retrieve-headers (articles &optional group server fetch-old)
   (save-excursion
     (set-buffer nntp-server-buffer)
     (erase-buffer)
-    (let ((number (length sequence))
+    (let ((number (length articles))
           (count 0)
+          (delim (concat "^" nnbabyl-mail-delimiter))
           article art-string start stop)
-      (nnbabyl-possibly-change-newsgroup newsgroup)
-      (if (stringp (car sequence))
-          'headers
-        (while sequence
-          (setq article (car sequence))
-          (setq art-string (nnbabyl-article-string article))
-          (set-buffer nnbabyl-mbox-buffer)
-          (if (or (search-forward art-string nil t)
+      (nnbabyl-possibly-change-newsgroup group server)
+      (while (setq article (pop articles))
+        (setq art-string (nnbabyl-article-string article))
+        (set-buffer nnbabyl-mbox-buffer)
+        (beginning-of-line)
+        (when (or (search-forward art-string nil t)
                   (search-backward art-string nil t))
-              (progn
-                (re-search-backward (concat "^" nnbabyl-mail-delimiter) nil t)
-                (while (and (not (looking-at ".+:"))
-                            (zerop (forward-line 1))))
-                (setq start (point))
-                (search-forward "\n\n" nil t)
-                (setq stop (1- (point)))
-                (set-buffer nntp-server-buffer)
-                (insert "221 " (int-to-string article) " Article retrieved.\n")
-                (insert-buffer-substring nnbabyl-mbox-buffer start stop)
-                (goto-char (point-max))
-                (insert ".\n")))
-          (setq sequence (cdr sequence))
-          (setq count (1+ count))
-          (and (numberp nnmail-large-newsgroup)
-               (> number nnmail-large-newsgroup)
-               (zerop (% count 20))
-               gnus-verbose-backends
-               (message "nnbabyl: Receiving headers... %d%%"
-                        (/ (* count 100) number))))
-
+          (re-search-backward delim nil t)
+          (while (and (not (looking-at ".+:"))
+                      (zerop (forward-line 1))))
+          (setq start (point))
+          (search-forward "\n\n" nil t)
+          (setq stop (1- (point)))
+          (set-buffer nntp-server-buffer)
+          (insert "221 ")
+          (princ article (current-buffer))
+          (insert " Article retrieved.\n")
+          (insert-buffer-substring nnbabyl-mbox-buffer start stop)
+          (goto-char (point-max))
+          (insert ".\n"))
         (and (numberp nnmail-large-newsgroup)
              (> number nnmail-large-newsgroup)
-             gnus-verbose-backends
-             (message "nnbabyl: Receiving headers...done"))
-
-        ;; Fold continuation lines.
-        (set-buffer nntp-server-buffer)
-        (goto-char (point-min))
-        (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
-          (replace-match " " t t))
-        'headers))))
-
-(defun nnbabyl-open-server (server &optional defs)
-  (nnheader-init-server-buffer)
-  (if (equal server nnbabyl-current-server)
-      t
-    (if nnbabyl-current-server
-        (setq nnbabyl-server-alist 
-              (cons (list nnbabyl-current-server
-                          (nnheader-save-variables nnbabyl-server-variables))
-                    nnbabyl-server-alist)))
-    (let ((state (assoc server nnbabyl-server-alist)))
-      (if state 
-          (progn
-            (nnheader-restore-variables (nth 1 state))
-            (setq nnbabyl-server-alist (delq state nnbabyl-server-alist)))
-        (nnheader-set-init-variables nnbabyl-server-variables defs)))
-    (setq nnbabyl-current-server server)))
-
-(defun nnbabyl-close-server (&optional server)
+             (zerop (% (incf count) 20))
+             (nnheader-message 5 "nnbabyl: Receiving headers... %d%%"
+                               (/ (* count 100) number))))
+
+      (and (numberp nnmail-large-newsgroup)
+           (> number nnmail-large-newsgroup)
+           (nnheader-message 5 "nnbabyl: Receiving headers...done"))
+
+      (set-buffer nntp-server-buffer)
+      (nnheader-fold-continuation-lines)
+      'headers)))
+
+(deffoo nnbabyl-open-server (server &optional defs)
+  (nnoo-change-server 'nnbabyl server defs)
+  (cond 
+   ((not (file-exists-p nnbabyl-mbox-file))
+    (nnbabyl-close-server)
+    (nnheader-report 'nnbabyl "No such file: %s" nnbabyl-mbox-file))
+   ((file-directory-p nnbabyl-mbox-file)
+    (nnbabyl-close-server)
+    (nnheader-report 'nnbabyl "Not a regular file: %s" nnbabyl-mbox-file))
+   (t
+    (nnheader-report 'nnbabyl "Opened server %s using mbox %s" server
+                     nnbabyl-mbox-file)
+    t)))
+
+(deffoo nnbabyl-close-server (&optional server)
+  ;; Restore buffer mode.
+  (when (and (nnbabyl-server-opened)
+             nnbabyl-previous-buffer-mode)
+    (save-excursion
+      (set-buffer nnbabyl-mbox-buffer)
+      (narrow-to-region
+       (caar nnbabyl-previous-buffer-mode)
+       (cdar nnbabyl-previous-buffer-mode))
+      (funcall (cdr nnbabyl-previous-buffer-mode))))
+  (nnoo-close-server 'nnbabyl server)
+  (setq nnbabyl-mbox-buffer nil)
   t)
 
-(defun nnbabyl-server-opened (&optional server)
-  (and (equal server nnbabyl-current-server)
+(deffoo nnbabyl-server-opened (&optional server)
+  (and (nnoo-current-server-p 'nnbabyl server)
        nnbabyl-mbox-buffer
        (buffer-name nnbabyl-mbox-buffer)
        nntp-server-buffer
        (buffer-name nntp-server-buffer)))
 
-(defun nnbabyl-status-message (&optional server)
-  nnbabyl-status-string)
-
-(defun nnbabyl-request-article (article &optional newsgroup server buffer)
-  (nnbabyl-possibly-change-newsgroup newsgroup)
-  (if (stringp article)
-      nil
-    (save-excursion
-      (set-buffer nnbabyl-mbox-buffer)
-      (goto-char (point-min))
-      (if (search-forward (nnbabyl-article-string article) nil t)
-          (let (start stop summary-line)
-            (re-search-backward (concat "^" nnbabyl-mail-delimiter) nil t)
-            (while (and (not (looking-at ".+:"))
-                        (zerop (forward-line 1))))
-            (setq start (point))
-            (or (and (re-search-forward 
-                      (concat "^" nnbabyl-mail-delimiter) nil t)
-                     (forward-line -1))
-                (goto-char (point-max)))
-            (setq stop (point))
-            (let ((nntp-server-buffer (or buffer nntp-server-buffer)))
-              (set-buffer nntp-server-buffer)
-              (erase-buffer)
-              (insert-buffer-substring nnbabyl-mbox-buffer start stop)
-              (goto-char (point-min))
-            ;; If there is an EOOH header, then we have to remove some
-            ;; duplicated headers. 
-            (setq summary-line (looking-at "Summary-line:"))
-            (if (search-forward "\n*** EOOH ***" nil t)
-                (if summary-line
-                    ;; The headers to be deleted are located before the
-                    ;; EOOH line...
-                    (delete-region (point-min) 
-                                   (progn (forward-line 1) (point)))
-                  ;; ...or after.
-                  (delete-region (progn (beginning-of-line) (point))
-                                 (or (search-forward "\n\n" nil t)
-                                     (point)))))
-            t))))))
-
-(defun nnbabyl-request-group (group &optional server dont-check)
+(deffoo nnbabyl-request-article (article &optional newsgroup server buffer)
+  (nnbabyl-possibly-change-newsgroup newsgroup server)
   (save-excursion
-    (if (nnbabyl-possibly-change-newsgroup group)
-        (if dont-check
-            t
-          (nnbabyl-get-new-mail group)
-          (save-excursion
-            (set-buffer nntp-server-buffer)
-            (erase-buffer)
-            (let ((active (assoc group nnbabyl-group-alist)))
-              (insert (format "211 %d %d %d %s\n" 
-                              (1+ (- (cdr (car (cdr active)))
-                                     (car (car (cdr active)))))
-                              (car (car (cdr active)))
-                              (cdr (car (cdr active)))
-                              (car active))))
-            t)))))
-
-(defun nnbabyl-close-group (group &optional server)
+    (set-buffer nnbabyl-mbox-buffer)
+    (goto-char (point-min))
+    (when (search-forward (nnbabyl-article-string article) nil t)
+      (let (start stop summary-line)
+        (re-search-backward (concat "^" nnbabyl-mail-delimiter) nil t)
+        (while (and (not (looking-at ".+:"))
+                    (zerop (forward-line 1))))
+        (setq start (point))
+        (or (and (re-search-forward 
+                  (concat "^" nnbabyl-mail-delimiter) nil t)
+                 (forward-line -1))
+            (goto-char (point-max)))
+        (setq stop (point))
+        (let ((nntp-server-buffer (or buffer nntp-server-buffer)))
+          (set-buffer nntp-server-buffer)
+          (erase-buffer)
+          (insert-buffer-substring nnbabyl-mbox-buffer start stop)
+          (goto-char (point-min))
+          ;; If there is an EOOH header, then we have to remove some
+          ;; duplicated headers. 
+          (setq summary-line (looking-at "Summary-line:"))
+          (when (search-forward "\n*** EOOH ***" nil t)
+            (if summary-line
+                ;; The headers to be deleted are located before the
+                ;; EOOH line...
+                (delete-region (point-min) (progn (forward-line 1)
+                                                  (point)))
+              ;; ...or after.
+              (delete-region (progn (beginning-of-line) (point))
+                             (or (search-forward "\n\n" nil t)
+                                 (point)))))
+          (if (numberp article) 
+              (cons nnbabyl-current-group article)
+            (nnbabyl-article-group-number)))))))
+
+(deffoo nnbabyl-request-group (group &optional server dont-check)
+  (let ((active (cadr (assoc group nnbabyl-group-alist))))
+    (save-excursion
+      (cond 
+       ((or (null active)
+            (null (nnbabyl-possibly-change-newsgroup group server)))
+        (nnheader-report 'nnbabyl "No such group: %s" group))
+       (dont-check
+        (nnheader-report 'nnbabyl "Selected group %s" group)
+        (nnheader-insert ""))
+       (t
+        (nnheader-report 'nnbabyl "Selected group %s" group)
+        (nnheader-insert "211 %d %d %d %s\n" 
+                         (1+ (- (cdr active) (car active)))
+                         (car active) (cdr active) group))))))
+
+(deffoo nnbabyl-request-scan (&optional group server)
+  (nnbabyl-read-mbox)
+  (nnmail-get-new-mail 
+   'nnbabyl 
+   (lambda ()
+     (save-excursion
+       (set-buffer nnbabyl-mbox-buffer)
+       (save-buffer)))
+   nnbabyl-mbox-file group
+   (lambda ()
+     (save-excursion
+       (let ((in-buf (current-buffer)))
+         (goto-char (point-min))
+         (while (search-forward "\n\^_\n" nil t)
+           (delete-char -1))
+         (set-buffer nnbabyl-mbox-buffer)
+         (goto-char (point-max))
+         (search-backward "\n\^_" nil t)
+         (goto-char (match-end 0))
+         (insert-buffer-substring in-buf)))
+     (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file))))
+
+(deffoo nnbabyl-close-group (group &optional server)
   t)
 
-(defun nnbabyl-request-create-group (group &optional server) 
+(deffoo nnbabyl-request-create-group (group &optional server) 
   (nnmail-activate 'nnbabyl)
-  (or (assoc group nnbabyl-group-alist)
-      (let (active)
-        (setq nnbabyl-group-alist (cons (list group (setq active (cons 1 0)))
-                                        nnbabyl-group-alist))
-        (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file)))
+  (unless (assoc group nnbabyl-group-alist)
+    (setq nnbabyl-group-alist (cons (list group (cons 1 0))
+                                    nnbabyl-group-alist))
+    (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file))
   t)
 
-(defun nnbabyl-request-list (&optional server)
-  (if server (nnbabyl-get-new-mail))
+(deffoo nnbabyl-request-list (&optional server)
   (save-excursion
-    (or (nnmail-find-file nnbabyl-active-file)
-        (progn
-          (setq nnbabyl-group-alist (nnmail-get-active))
-          (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file)
-          (nnmail-find-file nnbabyl-active-file)))))
+    (nnmail-find-file nnbabyl-active-file)
+    (setq nnbabyl-group-alist (nnmail-get-active))))
 
-(defun nnbabyl-request-newgroups (date &optional server)
+(deffoo nnbabyl-request-newgroups (date &optional server)
   (nnbabyl-request-list server))
 
-(defun nnbabyl-request-list-newsgroups (&optional server)
-  (setq nnbabyl-status-string "nnbabyl: LIST NEWSGROUPS is not implemented.")
-  nil)
-
-(defun nnbabyl-request-post (&optional server)
-  (mail-send-and-exit nil))
-
-(defalias 'nnbabyl-request-post-buffer 'nnmail-request-post-buffer)
+(deffoo nnbabyl-request-list-newsgroups (&optional server)
+  (nnheader-report 'nnbabyl "nnbabyl: LIST NEWSGROUPS is not implemented."))
 
-(defun nnbabyl-request-expire-articles
+(deffoo nnbabyl-request-expire-articles
   (articles newsgroup &optional server force)
-  (nnbabyl-possibly-change-newsgroup newsgroup)
-  (let* ((days (or (and nnmail-expiry-wait-function
-                        (funcall nnmail-expiry-wait-function newsgroup))
-                   nnmail-expiry-wait))
-         (is-old t)
+  (nnbabyl-possibly-change-newsgroup newsgroup server)
+  (let* ((is-old t)
          rest)
     (nnmail-activate 'nnbabyl)
 
     (save-excursion 
       (set-buffer nnbabyl-mbox-buffer)
-      (set-text-properties (point-min) (point-max) nil)
+      (gnus-set-text-properties (point-min) (point-max) nil)
       (while (and articles is-old)
         (goto-char (point-min))
         (if (search-forward (nnbabyl-article-string (car articles)) nil t)
-            (if (or force
-                    (setq is-old
-                          (> (nnmail-days-between 
-                              (current-time-string)
-                              (buffer-substring 
-                               (point) (progn (end-of-line) (point))))
-                             days)))
+            (if (setq is-old
+                      (nnmail-expired-article-p
+                       newsgroup
+                       (buffer-substring 
+                        (point) (progn (end-of-line) (point))) force))
                 (progn
-                  (and gnus-verbose-backends
-                       (message "Deleting article %s..." (car articles)))
+                  (nnheader-message 5 "Deleting article %d in %s..." 
+                                    (car articles) newsgroup)
                   (nnbabyl-delete-mail))
               (setq rest (cons (car articles) rest))))
         (setq articles (cdr articles)))
@@ -283,9 +284,9 @@
       (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file)
       (nconc rest articles))))
 
-(defun nnbabyl-request-move-article 
+(deffoo nnbabyl-request-move-article 
   (article group server accept-form &optional last)
-  (nnbabyl-possibly-change-newsgroup group)
+  (nnbabyl-possibly-change-newsgroup group server)
   (let ((buf (get-buffer-create " *nnbabyl move*"))
         result)
     (and 
@@ -310,7 +311,9 @@
        (and last (save-buffer))))
     result))
 
-(defun nnbabyl-request-accept-article (group &optional last)
+(deffoo nnbabyl-request-accept-article (group &optional server last)
+  (nnbabyl-possibly-change-newsgroup group server)
+  (nnmail-check-syntax)
   (let ((buf (current-buffer))
         result beg)
     (and 
@@ -330,14 +333,13 @@
        (goto-char (point-max))
        (search-backward "\n\^_")
        (goto-char (match-end 0))
-       (insert-buffer buf)
-       (and last (progn 
-                   (save-buffer)
-                   (nnmail-save-active
-                    nnbabyl-group-alist nnbabyl-active-file)))
+       (insert-buffer-substring buf)
+       (when last
+         (save-buffer)
+         (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file))
        result))))
 
-(defun nnbabyl-request-replace-article (article group buffer)
+(deffoo nnbabyl-request-replace-article (article group buffer)
   (nnbabyl-possibly-change-newsgroup group)
   (save-excursion
     (set-buffer nnbabyl-mbox-buffer)
@@ -349,8 +351,50 @@
       (save-buffer)
       t)))
 
+(deffoo nnbabyl-request-delete-group (group &optional force server)
+  (nnbabyl-possibly-change-newsgroup group server)
+  ;; Delete all articles in GROUP.
+  (if (not force)
+      ()                                ; Don't delete the articles.
+    (save-excursion
+      (set-buffer nnbabyl-mbox-buffer)
+      (goto-char (point-min))
+      ;; Delete all articles in this group.
+      (let ((ident (concat "\nX-Gnus-Newsgroup: " nnbabyl-current-group ":"))
+            found)
+        (while (search-forward ident nil t)
+          (setq found t)
+          (nnbabyl-delete-mail))
+        (and found (save-buffer)))))
+  ;; Remove the group from all structures.
+  (setq nnbabyl-group-alist 
+        (delq (assoc group nnbabyl-group-alist) nnbabyl-group-alist)
+        nnbabyl-current-group nil)
+  ;; Save the active file.
+  (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file)
+  t)
+
+(deffoo nnbabyl-request-rename-group (group new-name &optional server)
+  (nnbabyl-possibly-change-newsgroup group server)
+  (save-excursion
+    (set-buffer nnbabyl-mbox-buffer)
+    (goto-char (point-min))
+    (let ((ident (concat "\nX-Gnus-Newsgroup: " nnbabyl-current-group ":"))
+          (new-ident (concat "\nX-Gnus-Newsgroup: " new-name ":"))
+          found)
+      (while (search-forward ident nil t)
+        (replace-match new-ident t t)
+        (setq found t))
+      (and found (save-buffer))))
+  (let ((entry (assoc group nnbabyl-group-alist)))
+    (and entry (setcar entry new-name))
+    (setq nnbabyl-current-group nil)
+    ;; Save the new group alist.
+    (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file)
+    t))
+
 
-;;; Low-Level Interface
+;;; Internal functions.
 
 ;; If FORCE, delete article no matter how many X-Gnus-Newsgroup
 ;; headers there are. If LEAVE-DELIM, don't delete the Unix mbox
@@ -383,7 +427,10 @@
       (if (or force (not (re-search-forward "^X-Gnus-Newsgroup: " nil t)))
           (delete-region (point-min) (point-max))))))
 
-(defun nnbabyl-possibly-change-newsgroup (newsgroup)
+(defun nnbabyl-possibly-change-newsgroup (newsgroup &optional server)
+  (when (and server 
+             (not (nnbabyl-server-opened server)))
+    (nnbabyl-open-server server))
   (if (or (not nnbabyl-mbox-buffer)
           (not (buffer-name nnbabyl-mbox-buffer)))
       (save-excursion (nnbabyl-read-mbox)))
@@ -392,34 +439,44 @@
   (if newsgroup
       (if (assoc newsgroup nnbabyl-group-alist)
           (setq nnbabyl-current-group newsgroup)
-        (setq nnbabyl-status-string "No such group in file")
-        nil)))
+        (nnheader-report 'nnbabyl "No such group in file"))
+    t))
 
 (defun nnbabyl-article-string (article)
-  (concat "\nX-Gnus-Newsgroup: " nnbabyl-current-group ":" 
-          (int-to-string article) " "))
+  (if (numberp article)
+      (concat "\nX-Gnus-Newsgroup: " nnbabyl-current-group ":" 
+              (int-to-string article) " ")
+    (concat "\nMessage-ID: " article)))
+
+(defun nnbabyl-article-group-number ()
+  (save-excursion
+    (goto-char (point-min))
+    (and (re-search-forward "^X-Gnus-Newsgroup: +\\([^:]+\\):\\([0-9]+\\) "
+                            nil t)
+         (cons (buffer-substring (match-beginning 1) (match-end 1))
+               (string-to-int
+                (buffer-substring (match-beginning 2) (match-end 2)))))))
 
 (defun nnbabyl-insert-lines ()
   "Insert how many lines and chars there are in the body of the mail."
   (let (lines chars)
     (save-excursion
       (goto-char (point-min))
-      (if (search-forward "\n\n" nil t) 
-          (progn
-            ;; There may be an EOOH line here...
-            (if (looking-at "\\*\\*\\* EOOH \\*\\*\\*")
-                (search-forward "\n\n" nil t))
-            (setq chars (- (point-max) (point)))
-            (setq lines (- (count-lines (point) (point-max)) 1))
-            ;; Move back to the end of the headers. 
-            (goto-char (point-min))
-            (search-forward "\n\n" nil t)
-            (forward-char -1)
-            (save-excursion
-              (if (re-search-backward "^Lines: " nil t)
-                  (delete-region (point) (progn (forward-line 1) (point)))))
-            (insert (format "Lines: %d\n" lines))
-            chars)))))
+      (when (search-forward "\n\n" nil t) 
+        ;; There may be an EOOH line here...
+        (when (looking-at "\\*\\*\\* EOOH \\*\\*\\*")
+          (search-forward "\n\n" nil t))
+        (setq chars (- (point-max) (point))
+              lines (max (- (count-lines (point) (point-max)) 1) 0))
+        ;; Move back to the end of the headers. 
+        (goto-char (point-min))
+        (search-forward "\n\n" nil t)
+        (forward-char -1)
+        (save-excursion
+          (when (re-search-backward "^Lines: " nil t)
+            (delete-region (point) (progn (forward-line 1) (point)))))
+        (insert (format "Lines: %d\n" lines))
+        chars))))
 
 (defun nnbabyl-save-mail ()
   ;; Called narrowed to an article.
@@ -449,14 +506,14 @@
           (forward-char -1)
           (while group-art
             (insert (format "X-Gnus-Newsgroup: %s:%d   %s\n" 
-                            (car (car group-art)) (cdr (car group-art))
+                            (caar group-art) (cdar group-art)
                             (current-time-string)))
             (setq group-art (cdr group-art)))))
     t))
 
 (defun nnbabyl-active-number (group)
   ;; Find the next article number in GROUP.
-  (let ((active (car (cdr (assoc group nnbabyl-group-alist)))))
+  (let ((active (cadr (assoc group nnbabyl-group-alist))))
     (if active
         (setcdr active (1+ (cdr active)))
       ;; This group is new, so we create a new entry for it.
@@ -468,47 +525,70 @@
 
 (defun nnbabyl-read-mbox ()
   (nnmail-activate 'nnbabyl)
-  (or (file-exists-p nnbabyl-mbox-file)
-      (save-excursion
-        (set-buffer (setq nnbabyl-mbox-buffer
-                          (create-file-buffer nnbabyl-mbox-file)))
-        (setq buffer-file-name nnbabyl-mbox-file)
-        (insert "BABYL OPTIONS:\n\n\^_")
-        (write-region (point-min) (point-max) nnbabyl-mbox-file t 'nomesg)))
+  (unless (file-exists-p nnbabyl-mbox-file)
+    ;; Create a new, empty RMAIL mbox file.
+    (save-excursion
+      (set-buffer (setq nnbabyl-mbox-buffer
+                        (create-file-buffer nnbabyl-mbox-file)))
+      (setq buffer-file-name nnbabyl-mbox-file)
+      (insert "BABYL OPTIONS:\n\n\^_")
+      (write-region (point-min) (point-max) nnbabyl-mbox-file t 'nomesg)))
 
   (if (and nnbabyl-mbox-buffer
            (buffer-name nnbabyl-mbox-buffer)
            (save-excursion
              (set-buffer nnbabyl-mbox-buffer)
-             (= (buffer-size) (nth 7 (file-attributes nnbabyl-mbox-file)))))
-      ()
+             (= (buffer-size) (nnheader-file-size nnbabyl-mbox-file))))
+      () ; This buffer hasn't changed since we read it last.  Possibly.
     (save-excursion
       (let ((delim (concat "^" nnbabyl-mail-delimiter))
-            start end)
+            (alist nnbabyl-group-alist)
+            start end number)
         (set-buffer (setq nnbabyl-mbox-buffer 
                           (nnheader-find-file-noselect 
                            nnbabyl-mbox-file nil 'raw)))
+        ;; Save previous buffer mode.
+        (setq nnbabyl-previous-buffer-mode 
+              (cons (cons (point-min) (point-max))
+                    major-mode))
+
         (buffer-disable-undo (current-buffer))
         (widen)
         (setq buffer-read-only nil)
         (fundamental-mode)
+
+        ;; Go through the group alist and compare against
+        ;; the rmail file.
+        (while alist
+          (goto-char (point-max))
+          (when (and (re-search-backward
+                      (format "^X-Gnus-Newsgroup: %s:\\([0-9]+\\) "
+                              (caar alist)) nil t)
+                     (> (setq number
+                              (string-to-number 
+                               (buffer-substring
+                                (match-beginning 1) (match-end 1))))
+                        (cdadar alist)))
+            (setcdr (cadar alist) (1+ number)))
+          (setq alist (cdr alist)))
         
+        ;; We go through the mbox and make sure that each and 
+        ;; every mail belongs to some group or other.
         (goto-char (point-min))
         (re-search-forward delim nil t)
         (setq start (match-end 0))
         (while (re-search-forward delim nil t)
           (setq end (match-end 0))
-          (or (search-backward "\nX-Gnus-Newsgroup: " start t)
-              (progn
-                (goto-char end)
-                (save-excursion
-                  (save-restriction
-                    (goto-char start)
-                    (narrow-to-region start end)
-                    (nnbabyl-save-mail)
-                    (setq end (point-max))))))
+          (unless (search-backward "\nX-Gnus-Newsgroup: " start t)
+            (goto-char end)
+            (save-excursion
+              (save-restriction
+                (narrow-to-region (goto-char start) end)
+                (nnbabyl-save-mail)
+                (setq end (point-max)))))
           (goto-char (setq start end)))
-        (and (buffer-modified-p (current-buffer)) (save-buffer))
+        (when (buffer-modified-p (current-buffer))
+          (save-buffer))
         (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file)))))
 
 (defun nnbabyl-remove-incoming-delims ()
@@ -516,62 +596,29 @@
   (while (search-forward "\^_" nil t)
     (replace-match "?" t t)))
 
-(defun nnbabyl-get-new-mail (&optional group)
-  "Read new incoming mail."
-  (let* ((spools (nnmail-get-spool-files group))
-         (group-in group)
-         incoming incomings)
-    (nnbabyl-read-mbox)
-    (if (or (not nnbabyl-get-new-mail) (not nnmail-spool-file))
-        ()
-      ;; We go through all the existing spool files and split the
-      ;; mail from each.
-      (while spools
-        (and
-         (file-exists-p (car spools))
-         (> (nth 7 (file-attributes (car spools))) 0)
-         (progn
-           (and gnus-verbose-backends 
-                (message "nnbabyl: Reading incoming mail..."))
-           (if (not (setq incoming 
-                          (nnmail-move-inbox 
-                           (car spools) 
-                           (concat nnbabyl-mbox-file "-Incoming"))))
-               ()
-             (setq incomings (cons incoming incomings))
-             (save-excursion
-               (setq group (nnmail-get-split-group (car spools) group-in))
-               (let* ((nnmail-prepare-incoming-hook
-                       (cons 'nnbabyl-remove-incoming-delims
-                             nnmail-prepare-incoming-hook))
-                      in-buf)
-                 (setq in-buf (nnmail-split-incoming 
-                               incoming 'nnbabyl-save-mail t group))
-                 (set-buffer in-buf)
-                 (goto-char (point-min))
-                 (while (search-forward "\n\^_\n" nil t)
-                   (delete-char -1))
-                 (set-buffer nnbabyl-mbox-buffer)
-                 (goto-char (point-max))
-                 (search-backward "\n\^_" nil t)
-                 (goto-char (match-end 0))
-                 (insert-buffer-substring in-buf)
-                 (kill-buffer in-buf))))))
-        (setq spools (cdr spools)))
-      ;; If we did indeed read any incoming spools, we save all info. 
-      (and (buffer-modified-p nnbabyl-mbox-buffer) 
-           (save-excursion
-             (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file)
-             (set-buffer nnbabyl-mbox-buffer)
-             (save-buffer)))
-      (if incomings (run-hooks 'nnmail-read-incoming-hook))
-      (while incomings
-        (setq incoming (car incomings))
-        (and nnmail-delete-incoming
-             (file-exists-p incoming) 
-             (file-writable-p incoming) 
-             (delete-file incoming))
-        (setq incomings (cdr incomings))))))
+(defun nnbabyl-check-mbox ()
+  "Go through the nnbabyl mbox and make sure that no article numbers are reused."
+  (interactive)
+  (let ((idents (make-vector 1000 0))
+        id)
+    (save-excursion
+      (when (or (not nnbabyl-mbox-buffer)
+                (not (buffer-name nnbabyl-mbox-buffer)))
+        (nnbabyl-read-mbox))
+      (set-buffer nnbabyl-mbox-buffer)
+      (goto-char (point-min))
+      (while (re-search-forward "^X-Gnus-Newsgroup: \\([^ ]+\\) "  nil t)
+        (if (intern-soft (setq id (match-string 1)) idents)
+            (progn
+              (delete-region (progn (beginning-of-line) (point))
+                             (progn (forward-line 1) (point)))
+              (nnheader-message 7 "Moving %s..." id)
+              (nnbabyl-save-mail))
+          (intern id idents)))
+      (when (buffer-modified-p (current-buffer))
+        (save-buffer))
+      (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file)
+      (message ""))))
 
 (provide 'nnbabyl)
 
diff --git a/lisp/nneething.el b/lisp/nneething.el
index 691c84f0ecc..bcf013fdf8b 100644
--- a/lisp/nneething.el
+++ b/lisp/nneething.el
@@ -95,7 +95,7 @@ If this variable is nil, no files will be excluded.")
 
           (when (and (file-exists-p file)
                      (or (file-directory-p file)
-                         (not (zerop (nth 7 (file-attributes file))))))
+                         (not (zerop (nnheader-file-size file)))))
             (insert (format "221 %d Article retrieved.\n" article))
             (nneething-insert-head file)
             (insert ".\n"))
diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 90c1396ff34..6ff058247b3 100644
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -670,8 +670,9 @@ time saver for large mailboxes.")
         (let ((delim (concat "^" message-unix-mail-delimiter))
               (marker (concat "\n" nnfolder-article-marker))
               (number "[0-9]+")
-              (active (cadr (assoc nnfolder-current-group 
-                                   nnfolder-group-alist)))
+              (active (or (cadr (assoc nnfolder-current-group 
+                                       nnfolder-group-alist))
+                          (cons 1 0)))
               (scantime (assoc nnfolder-current-group nnfolder-scantime-alist))
               (minid (lsh -1 -1))
               maxid start end newscantime)
diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 3c6aaa9a509..1c93816dfb6 100644
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -570,6 +570,40 @@ without formatting."
     (while (re-search-forward "\r$" nil t)
       (delete-backward-char 1))))
 
+(defun nnheader-file-size (file)
+  "Return the file size of FILE or 0."
+  (or (nth 7 (file-attributes file)) 0))
+
+(defun nnheader-find-etc-directory (package)
+  "Go through the path and find the \".../etc/PACKAGE\" directory."
+  (let ((path load-path)
+        dir result)
+    ;; We try to find the dir by looking at the load path,
+    ;; stripping away the last component and adding "etc/".
+    (while path
+      (if (and (car path)
+               (file-exists-p
+                (setq dir (concat
+                           (file-name-directory
+                            (directory-file-name (car path)))
+                           "etc/" package "/")))
+               (file-directory-p dir))
+          (setq result dir
+                path nil)
+        (setq path (cdr path))))
+    result))
+
+(defvar ange-ftp-path-format)
+(defvar efs-path-regexp)
+(defun nnheader-re-read-dir (path)
+  "Re-read directory PATH if PATH is on a remote system."
+  (if (boundp 'ange-ftp-path-format)
+      (when (string-match (car ange-ftp-path-format) path)
+        (ange-ftp-re-read-dir path))
+    (if (boundp 'efs-path-regexp)
+        (when (string-match efs-path-regexp path)
+          (efs-re-read-dir path)))))
+
 (fset 'nnheader-run-at-time 'run-at-time)
 (fset 'nnheader-cancel-timer 'cancel-timer)
 (fset 'nnheader-find-file-noselect 'find-file-noselect)
diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index caf0a7c0c30..d108d590dad 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -382,9 +382,9 @@ parameter.  It should return nil, `warn' or `delete'.")
                              (substring inbox (+ popmail 3))))))
             (message "Getting mail from post office ..."))
         (when (or (and (file-exists-p tofile)
-                       (/= 0 (nth 7 (file-attributes tofile))))
+                       (/= 0 (nnheader-file-size tofile)))
                   (and (file-exists-p inbox)
-                       (/= 0 (nth 7 (file-attributes inbox)))))
+                       (/= 0 (nnheader-file-size inbox))))
           (message "Getting mail from %s..." inbox)))
       ;; Set TOFILE if have not already done so, and
       ;; rename or copy the file INBOX to TOFILE if and as appropriate.
@@ -923,8 +923,8 @@ See the documentation for the variable `nnmail-split-fancy' for documentation."
                             nnmail-procmail-suffix "$") t)))
            (p procmails)
            (crash (when (and (file-exists-p nnmail-crash-box)
-                             (> (nth 7 (file-attributes
-                                        (file-truename nnmail-crash-box))) 0))
+                             (> (nnheader-file-size
+                                 (file-truename nnmail-crash-box)) 0))
                     (list nnmail-crash-box))))
       ;; Remove any directories that inadvertantly match the procmail
       ;; suffix, which might happen if the suffix is "". 
@@ -937,8 +937,12 @@ See the documentation for the variable `nnmail-split-fancy' for documentation."
        crash
        (cond ((and group
                    (or (eq nnmail-spool-file 'procmail)
-                       nnmail-use-procmail))
+                       nnmail-use-procmail)
+                   procmails)
               procmails)
+             ((and group
+                   (eq nnmail-spool-file 'procmail))
+              nil)
              ((listp nnmail-spool-file)
               (append nnmail-spool-file procmails))
              ((stringp nnmail-spool-file)
@@ -1107,7 +1111,7 @@ See the documentation for the variable `nnmail-split-fancy' for documentation."
         ;; existance of POPped mail.
         (when (or (string-match "^po:" spool)
                   (and (file-exists-p spool)
-                       (> (nth 7 (file-attributes (file-truename spool))) 0)))
+                       (> (nnheader-file-size (file-truename spool)) 0)))
           (nnheader-message 3 "%s: Reading incoming mail..." method)
           (when (and (nnmail-move-inbox spool)
                      (file-exists-p nnmail-crash-box))
diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el
index 171463740db..9b7957247d4 100644
--- a/lisp/nnmbox.el
+++ b/lisp/nnmbox.el
@@ -484,7 +484,7 @@
            (buffer-name nnmbox-mbox-buffer)
            (save-excursion
              (set-buffer nnmbox-mbox-buffer)
-             (= (buffer-size) (nth 7 (file-attributes nnmbox-mbox-file)))))
+             (= (buffer-size) (nnheader-file-size nnmbox-mbox-file))))
       ()
     (save-excursion
       (let ((delim (concat "^" message-unix-mail-delimiter))
diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index bebc050effe..cc9adab8996 100644
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -157,6 +157,8 @@
         (nnheader-report 'nnmh "Selected group %s" group)
         t)
        (t
+        ;; Re-scan the directory if it's on a foreign system.
+        (nnheader-re-read-dir pathname)
         (setq dir 
               (sort
                (mapcar (lambda (name) (string-to-int name))
diff --git a/lisp/nnspool.el b/lisp/nnspool.el
index 82a607efe60..f80bf28b7cd 100644
--- a/lisp/nnspool.el
+++ b/lisp/nnspool.el
@@ -465,7 +465,7 @@ there.")
     (buffer-disable-undo (current-buffer))
     (erase-buffer)
     (condition-case ()
-        (call-process "grep" nil t nil id nnspool-history-file)
+        (call-process "grep" nil t nil (regexp-quote id) nnspool-history-file)
       (error nil))
     (goto-char (point-min))
     (prog1