X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fmm-bodies.el;h=d4c3677ff09e33a0a93db1dfb928a294197a556d;hb=82d219ce980dc263c9288225f901635336101fb4;hp=410d9f873bf18b98a8fc2e9076d57382de79fa99;hpb=839e4c6b1459c9d1fcc7b4b224ce080cfb80a43a;p=gnus

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index 410d9f873..d4c3677ff 100644
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -51,57 +51,61 @@ Valid encodings are `7bit', `8bit', `quoted-printable' and `base64'."
 			       (const base64))))
   :group 'mime)
 
-(defun mm-encode-body ()
+(defun mm-encode-body (&optional charset)
   "Encode a body.
 Should be called narrowed to the body that is to be encoded.
 If there is more than one non-ASCII MULE charset, then list of found
 MULE charsets are returned.
+If CHARSET is non-nil, it is used.
 If successful, the MIME charset is returned.
 If no encoding was done, nil is returned."
-  (if (not (featurep 'mule))
+  (if (not (mm-multibyte-p))
       ;; In the non-Mule case, we search for non-ASCII chars and
       ;; return the value of `mail-parse-charset' if any are found.
-      (save-excursion
-	(goto-char (point-min))
-	(if (re-search-forward "[^\x0-\x7f]" nil t)
-	    (or mail-parse-charset
-		(mm-read-charset "Charset used in the article: "))
-	  ;; The logic in `mml-generate-mime-1' confirms that it's OK
-	  ;; to return nil here.
-	  nil))
+      (or charset
+	  (save-excursion
+	    (goto-char (point-min))
+	    (if (re-search-forward "[^\x0-\x7f]" nil t)
+		(or mail-parse-charset
+		    (message-options-get 'mm-encody-body-charset)
+		    (message-options-set 
+		     'mm-encody-body-charset
+		     (mm-read-charset "Charset used in the article: ")))
+	      ;; The logic in `mml-generate-mime-1' confirms that it's OK
+	      ;; to return nil here.
+	      nil)))
     (save-excursion
-      (goto-char (point-min))
-      (let ((charsets (mm-find-mime-charset-region (point-min) (point-max)))
+      (if charset
+	  (progn
+	    (mm-encode-coding-region (point-min) (point-max) charset)
 	    charset)
-	(cond
-	 ;; No encoding.
-	 ((null charsets)
-	  nil)
-	 ;; Too many charsets.
-	 ((> (length charsets) 1)
-	  charsets)
-	 ;; We encode.
-	 (t
-	  (let ((charset (car charsets))
-		start)
-	    (when (or t
-		      ;; We always decode.
-		      (not (mm-coding-system-equal
-			    charset buffer-file-coding-system)))
-	      (while (not (eobp))
-		(if (eq (mm-charset-after) 'ascii)
-		    (when start
-		      (save-restriction
-			(narrow-to-region start (point))
-			(mm-encode-coding-region start (point) charset)
-			(goto-char (point-max)))
-		      (setq start nil))
-		  (unless start
-		    (setq start (point))))
-		(forward-char 1))
-	      (when start
-		(mm-encode-coding-region start (point) charset)
-		(setq start nil)))
+	(goto-char (point-min))
+	(let ((charsets (mm-find-mime-charset-region (point-min) (point-max)))
+	      start)
+	  (cond
+	   ;; No encoding.
+	   ((null charsets)
+	    nil)
+	   ;; Too many charsets.
+	   ((> (length charsets) 1)
+	    charsets)
+	   ;; We encode.
+	   (t
+	    (setq charset (car charsets))
+	    (while (not (eobp))
+	      (if (eq (mm-charset-after) 'ascii)
+		  (when start
+		    (save-restriction
+		      (narrow-to-region start (point))
+		      (mm-encode-coding-region start (point) charset)
+		      (goto-char (point-max)))
+		    (setq start nil))
+		(unless start
+		  (setq start (point))))
+	      (forward-char 1))
+	    (when start
+	      (mm-encode-coding-region start (point) charset)
+	      (setq start nil))
 	    charset)))))))
 
 (defun mm-body-encoding (charset &optional encoding)
@@ -231,13 +235,13 @@ The characters in CHARSET should then be decoded."
 
 (defun mm-decode-string (string charset)
   "Decode STRING with CHARSET."
-  (if (stringp charset)
-      (setq charset (intern (downcase charset))))
-  (if (or (not charset) 
-	  (eq 'gnus-all mail-parse-ignored-charsets)
-	  (memq 'gnus-all mail-parse-ignored-charsets)
-	  (memq charset mail-parse-ignored-charsets))
-      (setq charset mail-parse-charset))
+  (when (stringp charset)
+    (setq charset (intern (downcase charset))))
+  (when (or (not charset) 
+	    (eq 'gnus-all mail-parse-ignored-charsets)
+	    (memq 'gnus-all mail-parse-ignored-charsets)
+	    (memq charset mail-parse-ignored-charsets))
+    (setq charset mail-parse-charset))
   (or
    (when (featurep 'mule)
      (let ((mule-charset (mm-charset-to-coding-system charset)))