(rmail-auto-file): Rewrote test for "filed" using

rmail-desc-get-keywords.

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index 201fce711f44df0635f7164b619d8dce4794ca98..59bc26301b3b6d673779ae1d024b64b3bb0e4234 100644 (file)
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -1,5 +1,16 @@
 2006-01-17  Alex Schroeder  <alex@gnu.org>
 
+       * rmailsum.el (rmail-summary-by-labels): No longer concatenate
+       regexp with commas because of recent change to
+       rmail-message-labels-p.
+       (rmail-summary-rmail-update): Replace rmail-message-labels-p test
+       with simple rmail-desc-get-keywords.
+
+       * rmail.el (rmail-message-labels-p): Rewrote using
+       rmail-desc-get-keywords.
+       (rmail-auto-file): Rewrote test for "filed" using
+       rmail-desc-get-keywords.
+
        * rmailsum.el (rmail-summary-font-lock-keywords): Fix regular
        expression for unread messages.
        (rmail-summary-mode): Added documentation for the filtering

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 227abc0d07d18c232a3159822d69a35fa4eec882..e03e68bb37b67deda99c6954f8dddd3e9c5c597d 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2316,7 +2316,7 @@ iso-8859, koi8-r, etc."
 (defun rmail-auto-file ()
   "Automatically move a message into a sub-folder based on criteria.
 Called when a new message is displayed."
-  (if (or (rmail-message-labels-p rmail-current-message "filed")
+  (if (or (member "filed" (rmail-desc-get-keywords rmail-current-message))
          (not (string= (buffer-file-name)
                        (expand-file-name rmail-file-name))))
       ;; Do nothing if it's already been filed.