(mail-mode): Fix ordering in adaptive-fill-regexp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 52008eb41e215f0eff85efcb4caff91d8b7089f0..f6dc581ccfc5ba0d0a02cd4de3fa3412741b169e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-27  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * mail/sendmail.el (mail-mode): Fix ordering in adaptive-fill-regexp.
+
 2001-10-27  Gerd Moellmann  <gerd.moellmann@t-online.de>
 
        * net/ange-ftp.el (ange-ftp-send-cmd): Call fix-name-func for
@@ -26,11 +30,10 @@
        (ps-mode-print-buffer, ps-mode-print-region): Use `funcall'
        instead of `eval'.
        (ps-mode-print-region): Use `with-temp-buffer'.
-       (ps-run-start): Use of `mapconcat'.  Use `apply' instead of
-       `eval'.
+       (ps-run-start): Use of `mapconcat'.  Use `apply' instead of     `eval'.
        (numerous places): Add back-tick and tick around names in
        docstrings, fix punctuation in docstrings, remove trailing spaces.
-       
+
 2001-10-25  Gerd Moellmann  <gerd@gnu.org>
 
        * startup.el (normal-top-level): Check for frame-initial-frame
@@ -61,7 +64,7 @@
 
 2001-10-23  Gerd Moellmann  <gerd@gnu.org>
 
-       * info.el (Info-fontify-node): Bind doun-mouse-{1,2} instead
+       * info.el (Info-fontify-node): Bind down-mouse-{1,2} instead
        of mouse-{1,2} since dragging is on the down event.
 
        * play/doctor.el (make-doctor-variables): Remove a '($ please)'.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 98f6639230be6d677ada967ddb0288bfb2aea02f..c7a2edc4ec97fb8a1bdfbd4d0a674a4f69603d17 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -494,8 +494,8 @@ Turning on Mail mode runs the normal hooks `text-mode-hook' and
   (set (make-local-variable 'comment-start) mail-yank-prefix)
   (make-local-variable 'adaptive-fill-regexp)
   (setq adaptive-fill-regexp
-       (concat adaptive-fill-regexp
-               "\\|[ \t]*[-[:alnum:]]*>+[ \t]*"))
+       (concat "[ \t]*[-[:alnum:]]*>+[ \t]*\\|"
+               adaptive-fill-regexp))
   (make-local-variable 'adaptive-fill-first-line-regexp)
   (setq adaptive-fill-first-line-regexp
        (concat adaptive-fill-first-line-regexp