(mm-decode-content-transfer-encoding): Simplify.

2 files changed, 4 insertions, 5 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 44d6de5be07..2440a735b15 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
 2008-03-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * mm-bodies.el (mm-decode-content-transfer-encoding): Simplify.
+
         * gnus-sum.el: Use inhibit-read-only and with-current-buffer.
         (gnus-summary-jump-to-group): Consider windows on other displayed frames as
         well.  Similar changes might be needed elsewhere, but that's the one I've
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index 90d4acbdcd7..208c35f72bc 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -203,10 +203,7 @@ If TYPE is `text/plain' CRLF->LF translation may occur."
                (when (re-search-backward "^[A-Za-z0-9+/]+=*[\t ]*$" nil t)
                  (forward-line))
                (point))))
-           ((memq encoding '(7bit 8bit binary))
-            ;; Do nothing.
-            t)
-           ((null encoding)
+           ((memq encoding '(nil 7bit 8bit binary))
             ;; Do nothing.
             t)
            ((memq encoding '(x-uuencode x-uue))
@@ -307,5 +304,5 @@ decoding.  If it is nil, default to `mail-parse-charset'."
 
 (provide 'mm-bodies)
 
-;;; arch-tag: 41104bb6-4443-4ca9-8d5c-ff87ecf27d8d
+;; arch-tag: 41104bb6-4443-4ca9-8d5c-ff87ecf27d8d
 ;;; mm-bodies.el ends here