Synch to No Gnus 200402240748.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8ff4db..29b96d7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * message.el (message-setup-fill-variables): Add mml tags to
+       paragraph-start and paragraph-separate.  Suggested by Andrew Korty
+       <ajk@iu.edu>.
+       (message-mode): Don't modify paragraph-separate there.
+
 2004-02-17  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * compface.el (uncompface-use-external): Default to undecided.

diff --git a/lisp/message.el b/lisp/message.el
index 9f3bbce..56460bc 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2677,11 +2677,6 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
   (setq message-parameter-alist
        (copy-sequence message-startup-parameter-alist))
   (message-setup-fill-variables)
-  (set
-   (make-local-variable 'paragraph-separate)
-   (format "\\(%s\\)\\|\\(%s\\)"
-          paragraph-separate
-          "<#!*/?\\(multipart\\|part\\|external\\|mml\\|secure\\)"))
   ;; Allow using comment commands to add/remove quoting.
   (set (make-local-variable 'comment-start) message-yank-prefix)
   (if (featurep 'xemacs)
@@ -2728,7 +2723,8 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
           "---+$\\|"                   ; delimiters for forwarded messages
           page-delimiter "$\\|"        ; spoiler warnings
           ".*wrote:$\\|"               ; attribution lines
-          quote-prefix-regexp "$"))    ; empty lines in quoted text
+          quote-prefix-regexp "$\\|"   ; empty lines in quoted text
+          mime-edit-tag-regexp))       ; MIME-Edit tags
     (setq paragraph-separate paragraph-start)
     (setq adaptive-fill-regexp
          (concat quote-prefix-regexp "\\|" adaptive-fill-regexp))