Fix message-* user options that differ from Gnus trunk.

message.el (message-from-style, message-interactive, message-signature): Remove comment.
message.el (message-cite-prefix-regexp): Default to mail-citation-prefix-regexp always.
message.el (message-sendmail-envelope-from): Comment fix.
message.el (message-yank-prefix): Default to mail-yank-prefix always.
message.el (message-indentation-spaces): Default to mail-indentation-spaces always.
message.el (message-signature-file): Default to mail-signature-file always.
sendmail.el (mail-citation-prefix-regexp): Remove "}" from citation prefix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff55081fa9651e68f9142ca0a51a67d732181de2..54564dccffad5742a18f8af608669f547945f1f7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mail/sendmail.el (mail-citation-prefix-regexp): Remove "}" from
+       citation prefix.
+
 2010-09-27  Andreas Schwab  <schwab@linux-m68k.org>
 
        * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4fcf1af9ae2365d69dc4e7949aba4ec27bd68f82..a5576b063a123814ac5686a22c46b1b677fe6bad 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * message.el (message-from-style, message-interactive)
+       (message-signature): Remove comment.
+       (message-cite-prefix-regexp): Default to mail-citation-prefix-regexp
+       always.
+       (message-sendmail-envelope-from): Comment fix.
+       (message-yank-prefix): Default to mail-yank-prefix always.
+       (message-indentation-spaces): Default to mail-indentation-spaces always.
+       (message-signature-file): Default to mail-signature-file always.
+
 2010-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-sum.el (gnus-summary-read-group-1): Set gnus-newsgroup-highest.

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 2f4e6b8ef4c300c25abc4baa449ff35546138cbd..a24725b8cbf4d86fe2e19f93d07a15316a2155b3 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -160,8 +160,6 @@ If this variable is nil, no such courtesy message will be added."
   :type 'regexp)
 
 (defcustom message-from-style mail-from-style
-;; Default to the value of `mail-from-style', available in all Emacsen
-;; that Gnus supports.
   "*Specifies how \"From\" headers look.
 
 If nil, they contain just the return address like:
@@ -446,8 +444,6 @@ whitespace)."
   :group 'message-various)
 
 (defcustom message-interactive mail-interactive
-;; Default to the value of `mail-interactive', available in all Emacsen
-;; that Gnus supports.
   "Non-nil means when sending a message wait for and display errors.
 A value of nil means let mailer mail back a message to report errors."
   :version "23.2"
@@ -625,22 +621,7 @@ Done before generating the new subject of a forward."
   :link '(custom-manual "(message)Insertion Variables")
   :type 'regexp)
 
-(defcustom message-cite-prefix-regexp
-  (if (string-match "[[:digit:]]" "1")
-      ;; Support POSIX?  XEmacs 21.5.27 doesn't.
-      "\\([ \t]*[_.[:word:]]+>+\\|[ \t]*[]>|]\\)+"
-    ;; ?-, ?_ or ?. MUST NOT be in syntax entry w.
-    (let (non-word-constituents)
-      (with-syntax-table text-mode-syntax-table
-       (setq non-word-constituents
-             (concat
-              (if (string-match "\\w" "_")  "" "_")
-              (if (string-match "\\w" ".")  "" "."))))
-      (if (equal non-word-constituents "")
-         "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|]\\)+"
-       (concat "\\([ \t]*\\(\\w\\|["
-               non-word-constituents
-               "]\\)+>+\\|[ \t]*[]>|]\\)+"))))
+(defcustom message-cite-prefix-regexp mail-citation-prefix-regexp
   "*Regexp matching the longest possible citation prefix on a line."
   :version "24.1"
   :group 'message-insertion
@@ -834,9 +815,7 @@ Doing so would be even more evil than leaving it out."
   :type 'boolean)
 
 (defcustom message-sendmail-envelope-from
-  ;; Default to the value of `mail-envelope-from' if available.
-  ;; Note: as for Emacsen that Gnus supports, except for SXEmacs, it is
-  ;; unavailable unless sendmail.el is loaded.
+  ;; `mail-envelope-from' is unavailable unless sendmail.el is loaded.
   (if (boundp 'mail-envelope-from) mail-envelope-from)
   "*Envelope-from when sending mail with sendmail.
 If this is nil, use `user-mail-address'.  If it is the symbol
@@ -1014,10 +993,7 @@ Please also read the note in the documentation of
   :version "23.1" ;; No Gnus
   :group 'message-insertion)
 
-(defcustom message-yank-prefix
-  ;; Default to the value of `mail-yank-prefix' if available.
-  ;; Note: as for Emacs 21, it is unavailable unless sendmail.el is loaded.
-  (if (boundp 'mail-yank-prefix) mail-yank-prefix "> ")
+(defcustom message-yank-prefix mail-yank-prefix
   "*Prefix inserted on the lines of yanked messages.
 Fix `message-cite-prefix-regexp' if it is set to an abnormal value.
 See also `message-yank-cited-prefix' and `message-yank-empty-prefix'."
@@ -1043,11 +1019,7 @@ See also `message-yank-prefix' and `message-yank-cited-prefix'."
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-insertion)
 
-(defcustom message-indentation-spaces
-  ;; Default to the value of `mail-indentation-spaces' if available.
-  ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is unavailable
-  ;; unless sendmail.el is loaded.
-  (if (boundp 'mail-indentation-spaces) mail-indentation-spaces 3)
+(defcustom message-indentation-spaces mail-indentation-spaces
   "*Number of spaces to insert at the beginning of each cited line.
 Used by `message-yank-original' via `message-yank-cite'."
   :version "23.2"
@@ -1078,8 +1050,6 @@ point and mark around the citation text as modified."
   :group 'message-insertion)
 
 (defcustom message-signature mail-signature
-  ;; Default to the value of `mail-signature', available in all Emacsen
-  ;; that Gnus supports.
   "*String to be inserted at the end of the message buffer.
 If t, the `message-signature-file' file will be inserted instead.
 If a function, the result from the function will be used instead.
@@ -1089,11 +1059,7 @@ If a form, the result from the form will be used instead."
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-insertion)
 
-(defcustom message-signature-file
-  ;; Default to the value of `mail-signature-file' if available.
-  ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is unavailable
-  ;; unless sendmail.el is loaded.
-  (if (boundp 'mail-signature-file) mail-signature-file "~/.signature")
+(defcustom message-signature-file mail-signature-file
   "*Name of file containing the text inserted at end of message buffer.
 Ignored if the named file doesn't exist.
 If nil, don't insert a signature.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 6356c0a4cd516fba1ce6dceddbc03413ba52d613..081e743dcd88a81fe3c003165eb232700701a4d8 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -285,14 +285,14 @@ regardless of what part of it (if any) is included in the cited text.")
 
 ;;;###autoload
 (defcustom mail-citation-prefix-regexp
-  (purecopy "\\([ \t]*\\(\\w\\|[_.]\\)+>+\\|[ \t]*[]>|}]\\)+")
+  (purecopy "\\([ \t]*\\(\\w\\|[_.]\\)+>+\\|[ \t]*[]>|]\\)+")
   "Regular expression to match a citation prefix plus whitespace.
 It should match whatever sort of citation prefixes you want to handle,
 with whitespace before and after; it should also match just whitespace.
 The default value matches citations like `foo-bar>' plus whitespace."
   :type 'regexp
   :group 'sendmail
-  :version "20.3")
+  :version "24.1")
 
 (defvar mail-abbrevs-loaded nil)
 (defvar mail-mode-map