From 549962cc8ba2162e1d422cda82d9947289d23920 Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Mon, 24 Mar 2008 19:38:12 +0000 Subject: [PATCH] * message.el (message-signature-separator): Change default. Improve custom type. (message-cite-function): Change default to message-cite-original-without-signature. --- lisp/ChangeLog | 5 +++++ lisp/message.el | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 57281683e..34b54901f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2008-03-24 Reiner Steib + * message.el (message-signature-separator): Change default. Improve + custom type. + (message-cite-function): Change default to + message-cite-original-without-signature. + * gnus-sum.el (gnus-summary-make-menu-bar): Add message-cite-function toggle. diff --git a/lisp/message.el b/lisp/message.el index 6bc862300..572f78d9b 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -415,9 +415,17 @@ for `message-cross-post-insert-note'." ;;; End of variables adopted from `message-utils.el'. -(defcustom message-signature-separator "^-- *$" - "Regexp matching the signature separator." - :type 'regexp +(defcustom message-signature-separator "^-- $" + "Regexp matching the signature separator. +This variable is used to strip off the signature from quoted text +when `message-cite-function' is +`message-cite-original-without-signature'. Most useful values +are \"^-- $\" (strict) and \"^-- *$\" (loose; allow missing +whitespace)." + :type '(choice (const :tag "strict" "^-- $") + (const :tag "loose" "^-- *$") + regexp) + :version "23.1" ;; No Gnus (changed default) :link '(custom-manual "(message)Various Message Variables") :group 'message-various) @@ -1004,7 +1012,7 @@ Used by `message-yank-original' via `message-yank-cite'." :link '(custom-manual "(message)Insertion Variables") :type 'integer) -(defcustom message-cite-function 'message-cite-original +(defcustom message-cite-function 'message-cite-original-without-signature "*Function for citing an original message. Predefined functions include `message-cite-original' and `message-cite-original-without-signature'. @@ -1014,6 +1022,7 @@ Note that these functions use `mail-citation-hook' if that is non-nil." (function-item sc-cite-original) (function :tag "Other")) :link '(custom-manual "(message)Insertion Variables") + :version "23.1" ;; No Gnus (changed default) :group 'message-insertion) (defcustom message-indent-citation-function 'message-indent-citation -- 2.34.1