(message-setup-1): Mark buffer as unmodified _after_ running

message-setup-hook and handling message-alternative-emails.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e791e2..12a366a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,8 @@
 2008-03-24  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * message.el (message-check-news-body-syntax): Fix signature check.
+       (message-setup-1): Mark buffer as unmodified _after_ running
+       message-setup-hook and handling message-alternative-emails.
 
         * gnus-group.el (gnus-read-ephemeral-bug-group)
         (gnus-read-ephemeral-debian-bug-group)

diff --git a/lisp/message.el b/lisp/message.el
index 21cf811..5ede92e 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6212,11 +6212,12 @@ are not included."
   (save-restriction
     (message-narrow-to-headers)
     (run-hooks 'message-header-setup-hook))
-  (set-buffer-modified-p nil)
   (setq buffer-undo-list nil)
   (when message-generate-hashcash
     ;; Generate hashcash headers for recipients already known
     (mail-add-payment-async))
+  ;; Gnus posting styles are applied via buffer-local `message-setup-hook'
+  ;; values.
   (run-hooks 'message-setup-hook)
   ;; Do this last to give it precedence over posting styles, etc.
   (when (message-mail-p)
@@ -6225,6 +6226,8 @@ are not included."
       (if message-alternative-emails
          (message-use-alternative-email-as-from))))
   (message-position-point)
+  ;; Allow correct handling of `message-checksum' in `message-yank-original':
+  (set-buffer-modified-p nil)
   (undo-boundary))
 
 (defun message-set-auto-save-file-name ()