*** empty log message ***

[gnus] / lisp / message.el

diff --git a/lisp/message.el b/lisp/message.el
index 6a03d9e..e704d5a 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -301,7 +301,7 @@ If t, use `message-user-organization-file'."
   :group 'message-forwarding
   :type 'regexp)
 
-(defcustom message-make-forward-subject-function 
+(defcustom message-make-forward-subject-function
   'message-forward-subject-author-subject
  "*A list of functions that are called to generate a subject header for forwarded messages.
 The subject generated by the previous function is passed into each
@@ -666,6 +666,9 @@ Valid valued are `unique' and `unsent'."
   :type '(choice (const :tag "unique" unique)
                 (const :tag "unsent" unsent)))
 
+(defcustom message-default-charset nil
+  "Default charset used in non-MULE XEmacsen.")
+
 ;;; Internal variables.
 ;;; Well, not really internal.
 
@@ -877,8 +880,8 @@ The cdr of ech entry is a function for applying the face to a region.")
 (defvar message-send-coding-system 'binary
   "Coding system to encode outgoing mail.")
 
-(defvar message-draft-coding-system 
-  (cond 
+(defvar message-draft-coding-system
+  (cond
    ((not (fboundp 'coding-system-p)) nil)
    ((coding-system-p 'emacs-mule) 'emacs-mule)
    ((coding-system-p 'escape-quoted) 'escape-quoted)
@@ -1322,7 +1325,7 @@ Point is left at the beginning of the narrowed-to region."
   (define-key message-mode-map "\C-c\C-m\C-a" 'message-mime-attach-file)
   (define-key message-mode-map "\C-c\C-m\C-e" 'message-mime-attach-external)
   (define-key message-mode-map "\C-c\C-m\C-q" 'mml-quote-region)
-  
+
   (define-key message-mode-map "\t" 'message-tab))
 
 (easy-menu-define
@@ -1392,8 +1395,8 @@ C-c C-r  message-caesar-buffer-body (rot13 the message body)."
   (interactive)
   (kill-all-local-variables)
   (set (make-local-variable 'message-reply-buffer) nil)
-  (make-local-variable 'message-send-actions) 
-  (make-local-variable 'message-exit-actions) 
+  (make-local-variable 'message-send-actions)
+  (make-local-variable 'message-exit-actions)
   (make-local-variable 'message-kill-actions)
   (make-local-variable 'message-postpone-actions)
   (make-local-variable 'message-draft-article)
@@ -3749,7 +3752,7 @@ header line with the old Message-ID."
       (replace-match ""))
 
     (buffer-string)))
-    
+
 ;;; Forwarding messages.
 
 (defun message-forward-subject-author-subject (subject)
@@ -4212,7 +4215,9 @@ TYPE is the MIME type to use."
           type (prin1-to-string file))))
 
 (defun message-encode-message-body ()
-  (let (lines multipart-p content-type-p)
+  (let ((mail-parse-charset message-default-charset)
+       (case-fold-search t)
+       lines multipart-p content-type-p)
     (message-goto-body)
     (save-restriction
       (narrow-to-region (point) (point-max))
@@ -4233,7 +4238,7 @@ TYPE is the MIME type to use."
       (insert "MIME-Version: 1.0\n")
       (when lines
        (insert lines))
-      (setq multipart-p 
+      (setq multipart-p
            (re-search-backward "^Content-Type: multipart/" nil t))
       (goto-char (point-max))
       (setq content-type-p