(rmail-edit-mode): Set write-region-annotate-functions. (Bug#2625)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ddae1d7cb9bf8866393ac9f9c363ddcbf2af6ac..231369e36a5fc65665ad389af49d8c361efc9175 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-11  Glenn Morris  <rgm@gnu.org>
+
+       * mail/rmailedit.el (rmail-edit-mode):
+       Set write-region-annotate-functions.  (Bug#2625)
+
 2009-03-10  Juanma Barranquero  <lekktu@gmail.com>
 
        * w32-vars.el (w32-list-proportional-fonts): Fix typos in last change.

diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index 5b01e9435412b2f3f6dfe87f5c39163ac43dcdb3..80cc7c4578b609bbafc90d1b94e4bf7175c5476b 100644 (file)
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -64,6 +64,9 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'.
     (if (boundp 'mode-line-modified)
        (setq mode-line-modified (default-value 'mode-line-modified))
       (setq mode-line-format (default-value 'mode-line-format)))
+    ;; If someone uses C-x C-s, don't clobber the rmail file (bug#2625).
+    (add-hook 'write-region-annotate-functions
+             'rmail-write-region-annotate nil t)
     (run-mode-hooks 'rmail-edit-mode-hook)))
 
 ;; Rmail Edit mode is suitable only for specially formatted data.