(rmail): When reverting, swap buffers before setting counters. (Bug#2229)

(rmail-revert): Swap buffers before replacing contents.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b33c1b8d06290e736bef44b6736ef9ec103c65d6..c045edb54ff7ca45323dd8e91f8d86f7e6bd7bb9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2009-02-14  Glenn Morris  <rgm@gnu.org>
+
+       * mail/rmail.el (rmail): When reverting, swap buffers before setting
+       counters.  (Bug#2229)
+       (rmail-revert): Swap buffers before replacing contents.
+
+2009-02-14  Ian Eure  <ian@digg.com>  (tiny change)
+
+       * progmodes/sql.el (sql-product-alist, sql-connect-sqlite):
+       Remove host, user, password options not applicable to SQlite. (Bug#1904)
+
 2009-02-14  Richard M Stallman  <rms@gnu.org>
 
        * mail/rmailout.el (rmail-output-body-to-file): Avoid space and colon

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 4c234cab0d30c2ac4c7bc32fbd5f73159024423a..9ba9accd0d35c2aa35c8c0177371de5b058d21dd 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -846,6 +846,7 @@ If `rmail-display-summary' is non-nil, make a summary for this RMAIL file."
          (find-file file-name)
          (when (and (verify-visited-file-modtime existed)
                     (eq major-mode 'rmail-mode))
+           (rmail-swap-buffers-maybe)
            (rmail-set-message-counters)))
       ;; The mail file is either unchanged or not visited.  Visit it.
       (switch-to-buffer
@@ -1382,7 +1383,8 @@ If so restore the actual mbox message collection."
   (let* ((revert-buffer-function (default-value 'revert-buffer-function))
         (rmail-enable-multibyte enable-multibyte-characters)
         ;; See similar code in `rmail'.
-        (coding-system-for-read (and rmail-enable-multibyte 'raw-text)))
+        (coding-system-for-read (and rmail-enable-multibyte 'raw-text))
+        (before-revert-hook 'rmail-swap-buffers-maybe))
     ;; Call our caller again, but this time it does the default thing.
     (when (revert-buffer arg noconfirm)
       ;; If the user said "yes", and we changed something,