>>>>> Chong Yidong wrote:
> I've switched several message-mode defcustoms to the mail-* values.
> I've also made some changes to the mail-* defaults, so I don't think
> message mode users should see any change (mail mode users won't see much
> difference, either).

>>>>> In <E1NBA9i-0007bh-Va@cvs.savannah.gnu.org>:
> -(defcustom message-from-style 'default
> +(defcustom message-from-style
> +  (if (featurep 'xemacs) 'default mail-from-style)

XEmacs is not special, there is no reason not to use the mail-*
values.  In addition, there are some mail-* variables unavailable
in old Emacsen that Gnus supports.  Is it ok to commit the following
change?  The patch is attached in this message.

2009-11-20  Katsumi Yamaoka  <yamaoka@jpl.org>

	* message.el (message-from-style, message-interactive)
	(message-signature): Always set default values from the corresponding
	mail-* variables.
	(message-cite-prefix-regexp, message-sendmail-envelope-from)
	(message-yank-prefix, message-indentation-spaces)
	(message-signature-file, message-default-headers): Use boundp rather
	than (featurep 'xemacs) to check if the corresponding mail-* variables
	exist.

I run `EMACS -batch -q' (where EMACS is Emacs 21.1, 21.2, 21.4,
22.1, 22.2, 22.3, 23.1, 23.1.50, XEmacs 21.4.22, 21.5-b29 and
SXEmacs 22.1.11) with the following script:

(princ emacs-version)
(princ "\n")
(dolist (var '(mail-from-style
	       mail-interactive
	       mail-citation-prefix-regexp
	       mail-envelope-from
	       mail-yank-prefix
	       mail-indentation-spaces
	       mail-signature
	       mail-signature-file
	       mail-default-headers
	       mail-specify-envelope-from))
  (unless (boundp var)
    (princ var)
    (princ "\n")))

And I got:

21.1.1
mail-citation-prefix-regexp
mail-envelope-from
mail-yank-prefix
mail-indentation-spaces
mail-signature-file
mail-default-headers
21.2.1
mail-citation-prefix-regexp
mail-envelope-from
mail-yank-prefix
mail-indentation-spaces
mail-signature-file
mail-default-headers
21.4.1
mail-citation-prefix-regexp
mail-envelope-from
mail-yank-prefix
mail-indentation-spaces
mail-signature-file
mail-default-headers
22.1.1
mail-envelope-from
22.2.1
mail-envelope-from
22.3.1
mail-envelope-from
23.1.1
mail-envelope-from
23.1.50.1
mail-envelope-from
21.4 (patch 22) "Instant Classic" XEmacs Lucid
mail-citation-prefix-regexp
mail-envelope-from
mail-indentation-spaces
mail-signature-file
mail-default-headers
21.5  (beta29) "garbanzo" XEmacs Lucid
mail-citation-prefix-regexp
mail-envelope-from
mail-indentation-spaces
mail-signature-file
mail-default-headers
steve@sxemacs.org--2009/sxemacs--main--22.1.11--patch-33