* gnus.el: Don't test for `mm-guess-mime-charset'.

[gnus] / lisp / mm-bodies.el

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index ebadc4d..c0686e2 100644 (file)
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -44,7 +44,12 @@
 
 (defcustom mm-body-charset-encoding-alist
   '((iso-2022-jp . 7bit)
-    (iso-2022-jp-2 . 7bit))
+    (iso-2022-jp-2 . 7bit)
+    ;; We MUST encode UTF-16 because it can contain \0's which is
+    ;; known to break servers.
+    (utf-16 . base64)
+    (utf-16be . base64)
+    (utf-16le . base64))
   "Alist of MIME charsets to encodings.
 Valid encodings are `7bit', `8bit', `quoted-printable' and `base64'."
   :type '(repeat (cons (symbol :tag "charset")
@@ -85,8 +90,7 @@ If no encoding was done, nil is returned."
            charset)
        (goto-char (point-min))
        (let ((charsets (mm-find-mime-charset-region (point-min) (point-max)
-                                                    mm-hack-charsets))
-             start)
+                                                    mm-hack-charsets)))
          (cond
           ;; No encoding.
           ((null charsets)
@@ -96,24 +100,11 @@ If no encoding was done, nil is returned."
            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) (mm-charset-to-coding-system charset))
-                     (goto-char (point-max)))
-                   (setq start nil))
-               (unless start
-                 (setq start (point))))
-             (forward-char 1))
-           (when start
-             (mm-encode-coding-region start (point)
-                                      (mm-charset-to-coding-system charset))
-             (setq start nil))
-           charset)))))))
+           (prog1
+               (setq charset (car charsets))
+             (mm-encode-coding-region (point-min) (point-max)
+                                      (mm-charset-to-coding-system charset))))
+          ))))))
 
 (defun mm-long-lines-p (length)
   "Say whether any of the lines in the buffer is longer than LINES."
@@ -143,7 +134,7 @@ If no encoding was done, nil is returned."
       bits)
      ((and (not mm-use-ultra-safe-encoding)
           (not longp)
-          (not (eq '7bit (cdr (assq charset mm-body-charset-encoding-alist))))
+          (not (cdr (assq charset mm-body-charset-encoding-alist)))
           (or (eq t (cdr message-posting-charset))
               (memq charset (cdr message-posting-charset))
               (eq charset mail-parse-charset)))
@@ -243,17 +234,17 @@ If TYPE is `text/plain' CRLF->LF translation may occur."
       (while (search-forward "\r\n" nil t)
        (replace-match "\n" t t)))))
 
-(defun mm-decode-body (charset &optional encoding type force)
+(defun mm-decode-body (charset &optional encoding type)
   "Decode the current article that has been encoded with ENCODING.
 The characters in CHARSET should then be decoded.  If FORCE is non-nil
 use the supplied charset unconditionally."
-  (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))
   (save-excursion
     (when encoding
       (mm-decode-content-transfer-encoding encoding type))
@@ -272,28 +263,12 @@ use the supplied charset unconditionally."
                   (or (not (eq coding-system 'ascii))
                       (setq coding-system mail-parse-charset))
                   (not (eq coding-system 'gnus-decoded)))
-         (if force
-             (mm-decode-coding-region (point-min) (point-max)
-                                             coding-system)
-           (mm-decode-coding-region-safely (point-min) (point-max)
-                                           coding-system))))
-      (setq buffer-file-coding-system last-coding-system-used))))
-
-(defun mm-decode-coding-region-safely (start end coding-system)
-  "Decode region between START and END with CODING-SYSTEM.
-If CODING-SYSTEM is not a valid coding system for the text, let Emacs
-decide which coding system to use."
-  (let* ((orig (buffer-substring start end))
-        charsets)
-    (save-restriction
-      (narrow-to-region start end)
-      (mm-decode-coding-region (point-min) (point-max) coding-system)
-      (setq charsets (find-charset-region (point-min) (point-max)))
-      (when (or (memq 'eight-bit-control charsets)
-               (memq 'eight-bit-graphic charsets))
-       (delete-region (point-min) (point-max))
-       (insert orig)
-       (mm-decode-coding-region (point-min) (point-max) 'undecided)))))
+         (mm-decode-coding-region (point-min) (point-max)
+                                  coding-system))
+       (setq buffer-file-coding-system
+             (if (boundp 'last-coding-system-used)
+                 (symbol-value 'last-coding-system-used)
+               coding-system))))))
 
 (defun mm-decode-string (string charset)
   "Decode STRING with CHARSET."