(rmail-perm-variables): Make sure rmail-desc-vector is buffer local.

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index aed14a1c838725908a136d90ddfead3861d06b8a..71e77869438f3ea650a89918477596b9c44f74ae 100644 (file)
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -3,7 +3,9 @@
        * rmailout.el (rmail-output): Don't bind
        buffer-file-coding-system.
 
-       * rmail.el (rmail-mime-charset-pattern): Sync with trunk.
+       * rmail.el (rmail-perm-variables): Make sure rmail-desc-vector is
+       buffer local.
+       (rmail-mime-charset-pattern): Sync with trunk.
        (rmail): Don't bind coding-system-for-read.
        (rmail-revert): Likewise.
        (rmail-variables): Don't set buffer-file-coding-system.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 0f65fc8b58e60f48403ce8f63d919a813d3d6adf..a6994a1e883480cb1b54151344f8e27c6dc252fc 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1131,6 +1131,7 @@ Instead, these commands are available:
   (make-local-variable 'rmail-total-messages)
   (make-local-variable 'rmail-overlay-list)
   (setq rmail-overlay-list nil)
+  (make-local'variable 'rmail-desc-vector)
   (make-local-variable 'rmail-inbox-list)
   (setq rmail-inbox-list (rmail-get-file-inbox-list))
   ;; Provide default set of inboxes for primary mail file ~/RMAIL.
@@ -1464,6 +1465,8 @@ updated file.  It returns t if it got any new messages."
              ;; Process the new messages for spam using the integrated
              ;; spam filter.  The spam filter can mark messages for
              ;; deletion and can output a message.
+             ;; XXX rmail-spam-filter hasn't been tested at all with
+             ;; the mbox branch. --enberg
              (setq current-message (rmail-first-unseen-message))
              (when rmail-use-spam-filter
                (while (<= current-message rmail-total-messages)