# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1232213365 0
# Node ID f77a0ad643299125a15b66d97931185dc69e651a
# Parent  8ebf575b46aa85b2128e410ba826785646bfbb43
(buffer-swapped-with): Mark as permanent local.
(pmail-set-message-counters): Set pmail-deleted-vector from msg hdrs.
(pmail-auto-file): Simplify a regexp.

diff -r 8ebf575b46aa -r f77a0ad64329 lisp/mail/pmail.el
--- a/lisp/mail/pmail.el	Sat Jan 17 16:33:55 2009 +0000
+++ b/lisp/mail/pmail.el	Sat Jan 17 17:29:25 2009 +0000
@@ -50,8 +50,8 @@
   "Buffer that this buffer's contents are temporarily swapped with.
 You should only set this variable in file-visiting buffers,
 because it only affects how to save the buffer in its file.")
-
 (make-variable-buffer-local 'buffer-swapped-with)
+(put 'buffer-swapped-with 'permanent-local t)
 
 (defadvice basic-save-buffer
   (around check-swap activate)
@@ -2352,6 +2352,10 @@
 	  (while (<= i pmail-total-messages)
 	    (aset pmail-msgref-vector i (list i))
 	    (setq i (1+ i))))
+	(let ((i 0))
+	  (while (<= i pmail-total-messages)
+	    (pmail-set-message-deleted-p i (pmail-message-attr-p i ".D"))
+	    (setq i (1+ i))))
 	(message "Counting messages...done")))))
 
 
@@ -2688,7 +2692,7 @@
   "Automatically move a message into a sub-folder based on criteria.
 Called when a new message is displayed."
   (if (or (zerop pmail-total-messages)
-	  (pmail-message-attr-p pmail-current-message "...F...")
+	  (pmail-message-attr-p pmail-current-message "...F")
 	  (not (string= (buffer-file-name)
 			(expand-file-name pmail-file-name))))
       ;; Do nothing if the message has already been filed or if there