[Emacs-diffs] Changes to emacs/lisp/gnus/mm-decode.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/04/05 20:05:50

Index: mm-decode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/mm-decode.el,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- mm-decode.el        20 Mar 2008 15:49:10 -0000      1.55
+++ mm-decode.el        5 Apr 2008 20:05:50 -0000       1.56
@@ -235,6 +235,9 @@
        ;; makes it possible to install another package which provides an
        ;; alternative implementation of diff-mode.  --Stef
        (fboundp 'diff-mode)))
+    ;; In case mime.types uses x-diff (as does Debian's mime-support-3.40).
+    ("text/x-diff" mm-display-patch-inline
+     (lambda (handle) (fboundp 'diff-mode)))
     ("application/emacs-lisp" mm-display-elisp-inline identity)
     ("application/x-emacs-lisp" mm-display-elisp-inline identity)
     ("text/dns" mm-display-dns-inline identity)
@@ -1233,10 +1236,9 @@
       (setq filename (gnus-map-function mm-file-name-rewrite-functions
                                        (file-name-nondirectory filename))))
     (setq file
-         (mm-with-multibyte
           (read-file-name (or prompt "Save MIME part to: ")
                           (or mm-default-directory default-directory)
-                          nil nil (or filename ""))))
+                          nil nil (or filename "")))
     (setq mm-default-directory (file-name-directory file))
     (and (or (not (file-exists-p file))
             (yes-or-no-p (format "File %s already exists; overwrite? "