message: insert mail-header-separator read-only and intangible

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 894bc72..7ea9425 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,8 @@
 
        * message.el (message-setup-1): Always generate References first.
        (message-mail): Return the return value of message-setup, not always t.
+       (message-setup-1): Insert mail-header-separator with read-only and
+       intangible properties set.
 
        * gnus.el (gnus-summary-line-format): Add missing semi-colon for
        user-date in docstring.

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 78ef713..02d6393 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -257,7 +257,8 @@ Obeys the standard process/prefix convention."
       (gnus-setup-message 'forward
        (let ((article narticle))
          (message-mail)
-         (erase-buffer)
+          (let ((inhibit-read-only t))
+            (erase-buffer))
          (if (not (gnus-request-restore-buffer article group))
              (error "Couldn't restore the article")
            (when (and restore

diff --git a/lisp/message.el b/lisp/message.el
index 42ca73c..595a803 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6444,7 +6444,9 @@ are not included."
          (funcall message-default-headers)
        message-default-headers))
     (or (bolp) (insert ?\n)))
-  (insert mail-header-separator "\n")
+  (let ((message-forbidden-properties nil))
+    (insert (propertize (concat mail-header-separator "\n")
+                        'read-only t 'rear-nonsticky t 'intangible t)))
   (forward-line -1)
   ;; If a crash happens while replying, the auto-save file would *not* have a
   ;; `References:' header if `message-generate-headers-first' was nil.