Synch with Oort Gnus.

[elisp/gnus.git-] / lisp / message.el

diff --git a/lisp/message.el b/lisp/message.el
index 99b1823..d6f446c 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1876,6 +1876,7 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
     (setq adaptive-fill-first-line-regexp nil))
   (make-local-variable 'adaptive-fill-first-line-regexp)
   (make-local-variable 'auto-fill-inhibit-regexp)
+  (make-local-variable 'normal-auto-fill-function)
   (let ((quote-prefix-regexp
         ;; User should change message-cite-prefix-regexp if
         ;; message-yank-prefix is set to an abnormal value.
@@ -1897,7 +1898,7 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
                  adaptive-fill-first-line-regexp))
     ;;(setq auto-fill-inhibit-regexp "^[A-Z][^: \n\t]+:")
     (setq auto-fill-inhibit-regexp nil)
-    (setq auto-fill-function 'message-do-auto-fill)))
+    (setq normal-auto-fill-function 'message-do-auto-fill)))
 
 \f