[Emacs-diffs] /srv/bzr/emacs/trunk r106850: mail-mode paragraph-separate fix for bug#10276

[Glenn Morris]

------------------------------------------------------------
revno: 106850
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-01-11 21:05:15 -0500
message:
  mail-mode paragraph-separate fix for bug#10276
  
  * lisp/mail/sendmail.el (mail-mode):
  Update paragraph-separate for changes in adaptive-fill-regexp.
modified:
  lisp/ChangeLog
  lisp/mail/sendmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-11 22:21:44 +0000
+++ b/lisp/ChangeLog    2012-01-12 02:05:15 +0000
@@ -1,3 +1,8 @@
+2012-01-12  Glenn Morris  <address@hidden>
+
+       * mail/sendmail.el (mail-mode): Update paragraph-separate for
+       changes in adaptive-fill-regexp.  (Bug#10276)
+
 2012-01-11  Alan Mackenzie  <address@hidden>
 
        Fix Emacs bug #10463 - put `widen's around the critical spots.

=== modified file 'lisp/mail/sendmail.el'
--- a/lisp/mail/sendmail.el     2012-01-05 09:46:05 +0000
+++ b/lisp/mail/sendmail.el     2012-01-12 02:05:15 +0000
@@ -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 @@
   ;; 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 @@
 
 (provide 'sendmail)
 
+;; Local Variables:
+;; byte-compile-dynamic: t
+;; coding: utf-8
+;; End:
+
 ;;; sendmail.el ends here