[Emacs-diffs] emacs/lisp/gnus ChangeLog message.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/11/19 16:46:50

Modified files:
        lisp/gnus      : ChangeLog message.el 

Log message:
        * message.el (message-from-style, message-interactive)
        (message-cite-prefix-regexp, message-sendmail-envelope-from)
        (message-yank-prefix, message-indentation-spaces, message-signature)
        (message-signature-file, message-default-headers): For GNU Emacs, set
        default values from the corresponding mail-* variables.
        (message-send-mail-with-sendmail): Use envelope-from only if
        mail-specify-envelope-from is non-nil.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/ChangeLog?cvsroot=emacs&r1=1.838&r2=1.839
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/message.el?cvsroot=emacs&r1=1.173&r2=1.174

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.838
retrieving revision 1.839
diff -u -b -r1.838 -r1.839
--- ChangeLog   17 Nov 2009 22:10:40 -0000      1.838
+++ ChangeLog   19 Nov 2009 16:46:50 -0000      1.839
@@ -1,3 +1,13 @@
+2009-11-19  Chong Yidong  <address@hidden>
+
+       * message.el (message-from-style, message-interactive)
+       (message-cite-prefix-regexp, message-sendmail-envelope-from)
+       (message-yank-prefix, message-indentation-spaces, message-signature)
+       (message-signature-file, message-default-headers): For GNU Emacs, set
+       default values from the corresponding mail-* variables.
+       (message-send-mail-with-sendmail): Use envelope-from only if
+       mail-specify-envelope-from is non-nil.
+
 2009-11-17  Katsumi Yamaoka  <address@hidden>
 
        * rfc2047.el (rfc2047-decode-region): Don't quote decoded words

Index: message.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/message.el,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -b -r1.173 -r1.174
--- message.el  23 Sep 2009 23:58:41 -0000      1.173
+++ message.el  19 Nov 2009 16:46:50 -0000      1.174
@@ -159,7 +159,8 @@
   :group 'message-interface
   :type 'regexp)
 
-(defcustom message-from-style 'default
+(defcustom message-from-style
+  (if (featurep 'xemacs) 'default mail-from-style)
   "*Specifies how \"From\" headers look.
 
 If nil, they contain just the return address like:
@@ -433,7 +434,7 @@
   :link '(custom-manual "(message)Various Commands")
   :group 'message-various)
 
-(defcustom message-interactive t
+(defcustom message-interactive (if (featurep 'xemacs) t mail-interactive)
   "Non-nil means when sending a message wait for and display errors.
 nil means let mailer mail back a message to report errors."
   :group 'message-sending
@@ -610,9 +611,12 @@
   :type 'regexp)
 
 (defcustom message-cite-prefix-regexp
-  (if (string-match "[[:digit:]]" "1")
+  (cond ((not (featurep 'xemacs))
+        mail-citation-prefix-regexp)
+       ((string-match "[[:digit:]]" "1")
       ;; Support POSIX?  XEmacs 21.5.27 doesn't.
-      "\\([ \t]*[_.[:word:]]+>+\\|[ \t]*[]>|}]\\)+"
+        "\\([ \t]*[_.[:word:]]+>+\\|[ \t]*[]>|}]\\)+")
+       (t
     ;; ?-, ?_ or ?. MUST NOT be in syntax entry w.
     (let (non-word-constituents)
       (with-syntax-table text-mode-syntax-table
@@ -624,7 +628,7 @@
          "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|}]\\)+"
        (concat "\\([ \t]*\\(\\w\\|["
                non-word-constituents
-               "]\\)+>+\\|[ \t]*[]>|}]\\)+"))))
+                    "]\\)+>+\\|[ \t]*[]>|}]\\)+")))))
   "*Regexp matching the longest possible citation prefix on a line."
   :version "22.1"
   :group 'message-insertion
@@ -815,8 +819,10 @@
   :link '(custom-manual "(message)Mail Variables")
   :type 'boolean)
 
-(defcustom message-sendmail-envelope-from nil
+(defcustom message-sendmail-envelope-from
+  (if (featurep 'xemacs) nil mail-envelope-from)
   "*Envelope-from when sending mail with sendmail.
+This only has an effect if `mail-specify-envelope-from' is non-nil.
 If this is nil, use `user-mail-address'.  If it is the symbol
 `header', use the From: header of the message."
   :version "22.1"
@@ -992,7 +998,7 @@
   :version "23.1" ;; No Gnus
   :group 'message-insertion)
 
-(defcustom message-yank-prefix "> "
+(defcustom message-yank-prefix (if (featurep 'xemacs) "> " 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'."
@@ -1017,7 +1023,8 @@
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-insertion)
 
-(defcustom message-indentation-spaces 3
+(defcustom message-indentation-spaces
+  (if (featurep 'xemacs) 3 mail-indentation-spaces)
   "*Number of spaces to insert at the beginning of each cited line.
 Used by `message-yank-original' via `message-yank-cite'."
   :group 'message-insertion
@@ -1046,7 +1053,7 @@
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-insertion)
 
-(defcustom message-signature t
+(defcustom message-signature (if (featurep 'xemacs) t mail-signature)
   "*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.
@@ -1055,7 +1062,8 @@
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-insertion)
 
-(defcustom message-signature-file "~/.signature"
+(defcustom message-signature-file
+  (if (featurep 'xemacs) "~/.signature" 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.
@@ -1130,7 +1138,8 @@
   :valid-regexp "^\\'"
   :error "All header lines must be newline terminated")
 
-(defcustom message-default-headers ""
+(defcustom message-default-headers
+  (if (featurep 'xemacs) "" mail-default-headers)
   "*A string containing header lines to be inserted in outgoing messages.
 It is inserted before you edit the message, so you can edit or delete
 these lines."
@@ -4531,7 +4540,8 @@
                        ;; since some systems have broken sendmails.
                        ;; But some systems are more broken with -f, so
                        ;; we'll let users override this.
-                       (if (null message-sendmail-f-is-evil)
+                       (and (null message-sendmail-f-is-evil)
+                            mail-specify-envelope-from
                            (list "-f" (message-sendmail-envelope-from)))
                        ;; These mean "report errors by mail"
                        ;; and "deliver in background".