* message.el (message-setup-1): Don't bind the constant -forbidden-properties.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0eae505..ab79e94 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-04  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * message.el (message-setup-1): Don't bind the constant
+       -forbidden-properties.
+
 2011-02-03  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * nnimap.el (nnimap-request-accept-article): Give an error message if

diff --git a/lisp/message.el b/lisp/message.el
index 595a803..1111d2c 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -129,6 +129,17 @@
   :group 'message-buffers
   :type '(choice function (const nil)))
 
+(defcustom message-cite-style nil
+  "The overall style to be used when yanking cited text.
+Values are either `traditional' (cited text first),
+`top-post' (cited text at the bottom), or nil (don't override the
+individual message variables)."
+  :version "24.1"
+  :group 'message-various
+  :type '(choice (const :tag "None" :value nil)
+                (const :tag "Traditional" :value traditional)
+                (const :tag "Top-post" :value top-post)))
+
 (defcustom message-fcc-handler-function 'message-output
   "*A function called to save outgoing articles.
 This function will be called with the name of the file to store the
@@ -6444,9 +6455,8 @@ are not included."
          (funcall message-default-headers)
        message-default-headers))
     (or (bolp) (insert ?\n)))
-  (let ((message-forbidden-properties nil))
-    (insert (propertize (concat mail-header-separator "\n")
-                        'read-only t 'rear-nonsticky t 'intangible t)))
+  (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.