diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/mail/sendmail.el | 20 |
2 files changed, 19 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4f81fdab8e..f8d8ab379f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-01-12 Glenn Morris <[email protected]> + + * mail/sendmail.el (mail-mode): Update paragraph-separate for + changes in adaptive-fill-regexp. (Bug#10276) + 2012-01-11 Alan Mackenzie <[email protected]> Fix Emacs bug #10463 - put `widen's around the critical spots. diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index f0068e8181..a77918c5b1 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -1,4 +1,4 @@ -;;; sendmail.el --- mail sending commands for Emacs. -*- byte-compile-dynamic: t -*- +;;; sendmail.el --- mail sending commands for Emacs ;; Copyright (C) 1985-1986, 1992-1996, 1998, 2000-2012 ;; Free Software Foundation, Inc. @@ -743,11 +743,14 @@ Turning on Mail mode runs the normal hooks `text-mode-hook' and ;; lines that delimit forwarded messages. ;; Lines containing just >= 3 dashes, perhaps after whitespace, ;; are also sometimes used and should be separators. - (setq paragraph-separate (concat (regexp-quote mail-header-separator) - "$\\|\t*\\([-|#;>* ]\\|(?[0-9]+[.)]\\)+$" - "\\|[ \t]*[[:alnum:]]*>+[ \t]*$\\|[ \t]*$\\|" - "--\\( \\|-+\\)$\\|" - page-delimiter))) + (setq paragraph-separate + (concat (regexp-quote mail-header-separator) + ;; This is based on adaptive-fill-regexp. + ;; Presumably the idea is to allow filling of cited paragraphs. + "$\\|\t*[-–!|#%;>*·•‣⁃◦ ]+$" + "\\|[ \t]*[-[:alnum:]]*>+[ \t]*$\\|[ \t]*$\\|" + "--\\( \\|-+\\)$\\|" + page-delimiter))) (defun mail-header-end () @@ -1986,4 +1989,9 @@ you can move to one of them and type C-c C-c to recover that one." (provide 'sendmail) +;; Local Variables: +;; byte-compile-dynamic: t +;; coding: utf-8 +;; End: + ;;; sendmail.el ends here |