*** empty log message ***

[gnus] / lisp / nnmail.el

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 6ba318f..68991bd 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -112,7 +112,9 @@ If nil, the first match found will be used."
 
 ;; Added by gord@enci.ucalgary.ca (Gordon Matzigkeit).
 (defcustom nnmail-keep-last-article nil
-  "If non-nil, nnmail will never delete the last expired article in a directory.
+  "If non-nil, nnmail will never delete/move a group's last article.
+It can be marked expirable, so it will be deleted when it is no longer last.
+
 You may need to set this variable if other programs are putting
 new mail into folder numbers that Gnus has marked as expired."
   :group 'nnmail-procmail
@@ -539,7 +541,7 @@ parameter.  It should return nil, `warn' or `delete'."
 (defun nnmail-move-inbox (inbox)
   "Move INBOX to `nnmail-crash-box'."
   (if (not (file-writable-p nnmail-crash-box))
-      (gnus-error 1 "Can't write to crash box %s.  Not moving mail."
+      (gnus-error 1 "Can't write to crash box %s.  Not moving mail"
                  nnmail-crash-box)
     ;; If the crash box exists and is empty, we delete it.
     (when (and (file-exists-p nnmail-crash-box)
@@ -569,7 +571,7 @@ parameter.  It should return nil, `warn' or `delete'."
                      (nnmail-read-passwd
                       (format "Password for %s: "
                               (substring inbox (+ popmail 3))))))
-             (message "Getting mail from post office ..."))
+             (message "Getting mail from the post office..."))
          (when (or (and (file-exists-p tofile)
                         (/= 0 (nnheader-file-size tofile)))
                    (and (file-exists-p inbox)
@@ -804,7 +806,7 @@ is a spool.  If not using procmail, return GROUP."
                           (= (following-char) ?\n)))
                     (save-excursion
                       (forward-line 1)
-                      (while (looking-at ">From ")
+                      (while (looking-at ">From \\|From ")
                         (forward-line 1))
                       (looking-at "[^ \n\t:]+[ \n\t]*:")))
            (setq found 'yes)))))
@@ -833,7 +835,7 @@ is a spool.  If not using procmail, return GROUP."
                           (= (following-char) ?\n)))
                     (save-excursion
                       (forward-line 1)
-                      (while (looking-at ">From ")
+                      (while (looking-at ">From \\|From ")
                         (forward-line 1))
                       (looking-at "[^ \n\t:]+[ \n\t]*:")))
            (setq found 'yes)))))
@@ -1056,7 +1058,7 @@ FUNC will be called with the group name to determine the article number."
              ;; to do?  Just remove the `junk' spec.  Don't really
              ;; see anything else to do...
              (let (elem)
-               (while (setq elem (assq 'junk split))
+               (while (setq elem (car (memq 'junk split)))
                  (setq split (delq elem split))))
              (when split
                (setq group-art
@@ -1093,7 +1095,7 @@ FUNC will be called with the group name to determine the article number."
          ;; to do?  Just remove the `junk' spec.  Don't really
          ;; see anything else to do...
          (let (elem)
-           (while (setq elem (assq 'junk group-art))
+           (while (setq elem (car (memq 'junk group-art)))
              (setq group-art (delq elem group-art)))
            (nreverse group-art)))))))