From bb7fc970a861480ad4f66cf10e22a7d68e41cc10 Mon Sep 17 00:00:00 2001 From: morioka Date: Thu, 27 Nov 1997 07:53:18 +0000 Subject: [PATCH] sync with qgnus-0.12. --- lisp/message.el | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/lisp/message.el b/lisp/message.el index eadb249..28c131b 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -199,13 +199,13 @@ included. Organization, Lines and X-Mailer are optional." :type 'sexp) (defcustom message-ignored-news-headers - "^NNTP-Posting-Host:\\|^Xref:\\|^Bcc:\\|^Gcc:\\|^Fcc:\\|^Resent-Fcc:" + "^NNTP-Posting-Host:\\|^Xref:\\|^[BGF]cc:\\|^Resent-Fcc:" "*Regexp of headers to be removed unconditionally before posting." :group 'message-news :group 'message-headers :type 'regexp) -(defcustom message-ignored-mail-headers "^Gcc:\\|^Fcc:\\|^Resent-Fcc:" +(defcustom message-ignored-mail-headers "^[GF]cc:\\|^Resent-Fcc:" "*Regexp of headers to be removed unconditionally before mailing." :group 'message-mail :group 'message-headers @@ -1075,7 +1075,8 @@ Return the number of headers removed." (save-excursion (save-restriction (message-narrow-to-headers) - (message-fetch-field "newsgroups"))))) + (and (message-fetch-field "newsgroups") + (not (message-fetch-field "posted-to"))))))) (defun message-mail-p () "Say whether the current buffer contains a mail message." @@ -1268,16 +1269,19 @@ C-c C-r message-caesar-buffer-body (rot13 the message body)." facemenu-remove-face-function t) (make-local-variable 'paragraph-separate) (make-local-variable 'paragraph-start) - (setq paragraph-start (concat (regexp-quote mail-header-separator) - "$\\|[ \t]*[-_][-_][-_]+$\\|" - "-- $\\|" - "[> ]+$\\|" - paragraph-start)) - (setq paragraph-separate (concat (regexp-quote mail-header-separator) - "$\\|[ \t]*[-_][-_][-_]+$\\|" - "-- $\\|" - "[> ]+$\\|" - paragraph-separate)) + (setq paragraph-start + (concat (regexp-quote mail-header-separator) + "$\\|[ \t]*[-_][-_][-_]+$\\|" + "-- $\\|" + ;;!!! Uhm... shurely this can't be right. + "[> " (regexp-quote message-yank-prefix) "]+$\\|" + paragraph-start)) + (setq paragraph-separate + (concat (regexp-quote mail-header-separator) + "$\\|[ \t]*[-_][-_][-_]+$\\|" + "-- $\\|" + "[> " (regexp-quote message-yank-prefix) "]+$\\|" + paragraph-separate)) (make-local-variable 'message-reply-headers) (setq message-reply-headers nil) (make-local-variable 'message-newsreader) -- 1.7.10.4