Sync up with Pterodactyl Gnus v0.95.

[elisp/gnus.git-] / lisp / mm-encode.el

diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el
index b5a4b3b..ddb5b0b 100644 (file)
--- a/lisp/mm-encode.el
+++ b/lisp/mm-encode.el
@@ -25,15 +25,18 @@
 ;;; Code:
 
 (require 'mail-parse)
-(require 'mailcap)
+(require 'gnus-mailcap)
 
 (defvar mm-content-transfer-encoding-defaults
-  '(("text/.*" quoted-printable)
-    ("message/rfc822" quoted-printable)
+  '(("text/x-patch" 8bit)
+    ("text/.*" qp-or-base64)
+    ("message/rfc822" 8bit)
     ("application/emacs-lisp" 8bit)
     ("application/x-patch" 8bit)
-    (".*" base64))
-  "Alist of regexps that match MIME types and their encodings.")
+    (".*" qp-or-base64))
+  "Alist of regexps that match MIME types and their encodings.
+If the encoding is `qp-or-base64', then either quoted-printable
+or base64 will be used, depending on what is more efficient.")
 
 (defun mm-insert-rfc822-headers (charset encoding)
   "Insert text/plain headers with CHARSET and ENCODING."
@@ -75,14 +78,8 @@
     )
    ((null encoding)
     )
-   ;;((eq encoding 'x-uuencode)
-   ;; (condition-case ()
-   ;;  (uudecode-encode-region (point-min) (point-max))
-   ;;   (error nil)))
    ((functionp encoding)
-    (condition-case ()
-       (funcall encoding (point-min) (point-max))
-      (error nil)))
+    (ignore-errors (funcall encoding (point-min) (point-max))))
    (t
     (message "Unknown encoding %s; defaulting to 8bit" encoding))))
 
@@ -93,7 +90,12 @@ The encoding used is returned."
         (encoding
          (or (and (listp type)
                   (cadr (assq 'encoding type)))
-             (mm-content-transfer-encoding mime-type))))
+             (mm-content-transfer-encoding mime-type)))
+        (bits (mm-body-7-or-8)))
+    ;; We force buffers that are 7bit to be unencoded, no matter
+    ;; what the preferred encoding is.
+    (when (eq bits '7bit)
+      (setq encoding bits))
     (mm-encode-content-transfer-encoding encoding mime-type)
     encoding))
 
@@ -111,14 +113,38 @@ The encoding used is returned."
   (insert "\n"))
 
 (defun mm-content-transfer-encoding (type)
-  "Return a CTE suitable for TYPE."
+  "Return a CTE suitable for TYPE to encode the current buffer."
   (let ((rules mm-content-transfer-encoding-defaults))
     (catch 'found
       (while rules
        (when (string-match (caar rules) type)
-         (throw 'found (cadar rules)))
+         (throw 'found
+                (if (eq (cadar rules) 'qp-or-base64)
+                    (mm-qp-or-base64)
+                  (cadar rules))))
        (pop rules)))))
 
+(defun mm-qp-or-base64 ()
+  (save-excursion
+    (save-restriction
+      (narrow-to-region (point-min) (min (+ (point-min) 1000) (point-max)))
+      (goto-char (point-min))
+      (let ((8bit 0))
+       (cond
+        ((not (featurep 'mule))
+         (while (re-search-forward "[^\x00-\x7f]" nil t)
+           (incf 8bit)))
+        (t
+         ;; Mule version
+         (while (not (eobp))
+           (skip-chars-forward "\0-\177")
+           (unless (eobp)
+             (forward-char 1)
+             (incf 8bit)))))
+       (if (> (/ (* 8bit 1.0) (buffer-size)) 0.166)
+           'quoted-printable
+         'base64)))))
+
 (provide 'mm-encode)
 
 ;;; mm-encode.el ends here