Sync with HEAD

[gnu-emacs] / lisp / gnus / mm-encode.el

diff --git a/lisp/gnus/mm-encode.el b/lisp/gnus/mm-encode.el
index 65fc34acfd730b10d0bdbcc546192e5454e6cf43..dd6974a70904b98f9f4e4cdebd8b6df3f16154d9 100644 (file)
--- a/lisp/gnus/mm-encode.el
+++ b/lisp/gnus/mm-encode.el
@@ -1,5 +1,5 @@
-;;; mm-encode.el --- Functions for encoding MIME things 
-;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+;;; mm-encode.el --- functions for encoding MIME things
+;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -35,8 +35,9 @@
     ("text/.*" qp-or-base64)
     ("message/rfc822" 8bit)
     ("application/emacs-lisp" 8bit)
+    ("application/x-emacs-lisp" 8bit)
     ("application/x-patch" 8bit)
-    (".*" qp-or-base64))
+    (".*" 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.")
@@ -78,7 +79,7 @@ This variable should never be set directly, but bound before a call to
   "Return a safer but similar encoding."
   (cond
    ((memq encoding '(7bit 8bit quoted-printable)) 'quoted-printable)
-   ;; The remaing encodings are binary and base64 (and perhaps some
+   ;; The remaining encodings are binary and base64 (and perhaps some
    ;; non-standard ones), which are both turned into base64.
    (t 'base64)))
 
@@ -143,7 +144,7 @@ The encoding used is returned."
       (while rules
        (when (string-match (caar rules) type)
          (throw 'found
-                (let ((encoding 
+                (let ((encoding
                        (if (eq (cadr (car rules)) 'qp-or-base64)
                            (mm-qp-or-base64)
                          (cadr (car rules)))))
@@ -171,4 +172,5 @@ The encoding used is returned."
 
 (provide 'mm-encode)
 
+;;; arch-tag: 7d01bba4-d469-4851-952b-dc863f84ed66
 ;;; mm-encode.el ends here