X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fmessage.el;h=38073b401653fca5a678f6c7037a7885883f76f9;hb=0651fabaac80cf08698f066dae0af33f29b91a9a;hp=f8e0cc2f9cc8364fe4fe17945997bd9383f6e7ec;hpb=3403a2fc723c134f53d6c149c752ba2e03bd3f6b;p=gnus

diff --git a/lisp/message.el b/lisp/message.el
index f8e0cc2f9..38073b401 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -665,8 +665,9 @@ Valid valued are `unique' and `unsent'."
 		 (const :tag "unsent" unsent)))
 
 (defcustom message-default-charset 
-  (and (featurep 'xemacs) (not (featurep 'mule)) 'iso-8859-1)
-  "Default charset used in non-MULE XEmacsen."
+  (and (not (mm-multibyte-p)) 'iso-8859-1)
+  "Default charset used in non-MULE Emacsen.
+If nil, you might be asked to input the charset."
   :group 'message
   :type 'symbol)
 
@@ -910,6 +911,7 @@ The first matched address (not primary one) is used in the From field."
 
 ;;; Internal variables.
 
+(defvar message-sending-message "Sending...")
 (defvar message-buffer-list nil)
 (defvar message-this-is-news nil)
 (defvar message-this-is-mail nil)
@@ -2118,7 +2120,7 @@ It should typically alter the sending method in some way or other."
     (put-text-property (point-min) (point-max) 'read-only nil))
   (message-fix-before-sending)
   (run-hooks 'message-send-hook)
-  (message "Sending...")
+  (message message-sending-message)
   (let ((alist message-send-method-alist)
 	(success t)
 	elem sent)