summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2009-02-14 03:40:39 +0000
committerGlenn Morris <rgm@gnu.org>2009-02-14 03:40:39 +0000
commit40f9db320dfca6f0330f64539f45d0996c97d234 (patch)
treea494d8455cba8a82026a0375ee3691d55861c69a
parentf5107fea3e890e8641dde9faa0958c8dba2dda1d (diff)
downloademacs-40f9db320dfca6f0330f64539f45d0996c97d234.tar.gz
(rmail): When reverting, swap buffers before setting counters. (Bug#2229)
(rmail-revert): Swap buffers before replacing contents.
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/mail/rmail.el4
2 files changed, 14 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b33c1b8d062..c045edb54ff 100644
--- 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 4c234cab0d3..9ba9accd0d3 100644
--- 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,