(mail-mode): Add the citation regexp

to adaptive-fill-regexp after the usual contents.
But modify the usual contents not to match whitespace alone;
match that again last.
Add that citation regexp to paragraph-start and paragraph-separate too.

1 files changed, 7 insertions, 3 deletions

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 81a99113f9d..43185e8a071 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -425,16 +425,20 @@ Here are commands that move to a header field (and create it if there isn't):
   (setq fill-paragraph-function 'mail-mode-fill-paragraph)
   (make-local-variable 'adaptive-fill-regexp)
   (setq adaptive-fill-regexp
-	(concat "[ \t]*[-a-z0-9A-Z]*>+[ \t]*\\|" adaptive-fill-regexp))
+	(concat "[ \t]*\\([-|#;>*]+ *\\|(?[0-9]+[.)] *\\)+"
+		"\\|[ \t]*[-a-z0-9A-Z]*>+[ \t]*"
+		"\\|[ \t]*"))
   (make-local-variable 'adaptive-fill-first-line-regexp)
   (setq adaptive-fill-first-line-regexp
-	(concat "[ \t]*[-a-z0-9A-Z]*>+[ \t]*\\|" adaptive-fill-first-line-regexp))
+	(concat adaptive-fill-first-line-regexp
+		"\\|[ \t]*[-a-z0-9A-Z]*>+[ \t]*"))
   ;; `-- ' precedes the signature.  `-----' appears at the start of the
   ;; lines that delimit forwarded messages.
   ;; Lines containing just >= 3 dashes, perhaps after whitespace,
   ;; are also sometimes used and should be separators.
   (setq paragraph-start (concat (regexp-quote mail-header-separator)
-				"$\\|[ \t]*[a-z0-9A-Z]*>+[ \t]*$\\|[ \t]*$\\|"
+				"$\\|[ \t]*\\([-|#;>*]+ *\\|(?[0-9]+[.)] *\\)*$"
+				"\\|[ \t]*[a-z0-9A-Z]*>+[ \t]*$\\|[ \t]*$\\|"
 				"-- $\\|---+$\\|"
 				page-delimiter))
   (setq paragraph-separate paragraph-start)