(mm-inline-media-tests): Check presence of the diff-mode

function rather than the diff-mode.el package.
(mm-display-external): Use with-current-buffer.
(mm-viewer-completion-map, mm-viewer-completion-map):
Move initialization inside declaration.

2 files changed, 29 insertions, 20 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 36963b5ce24..ebe75811cb0 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mm-decode.el (mm-inline-media-tests): Check presence of the diff-mode
+        function rather than the diff-mode.el package.
+        (mm-display-external): Use with-current-buffer.
+        (mm-viewer-completion-map, mm-viewer-completion-map):
+        Move initialization inside declaration.
+
 2005-09-28  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * message.el: Remove useless autoloads.
@@ -16,10 +24,9 @@
         * mm-uu.el (mm-uu-emacs-sources-regexp): Make variable
         customizable.  Change default value.
         (mm-uu-diff-groups-regexp): Change default value.
-        (mm-uu-type-alist): Added doc string.
-        (mm-uu-configure): Added doc string.  Make it interactive.
-        (mm-uu-diff-groups-regexp): Fix missing quotes from previous
-        commit.
+        (mm-uu-type-alist): Add doc string.
+        (mm-uu-configure): Add doc string.  Make it interactive.
+        (mm-uu-diff-groups-regexp): Fix missing quotes from previous commit.
 
 2005-09-27  Simon Josefsson  <jas@extundo.com>
 
@@ -75,8 +82,8 @@
 
 2005-09-22  Reiner Steib  <Reiner.Steib@gmx.de>
 
-        * spam-report.el (spam-report-url-ping-plain): Use
-        gnus-extended-version as User-Agent.
+        * spam-report.el (spam-report-url-ping-plain):
+        Use gnus-extended-version as User-Agent.
 
         * gnus-agent.el (gnus-agent-synchronize-flags): Explain why the
         default value is nil.
@@ -92,7 +99,7 @@
 
         * mm-url.el (mm-url-decode-entities): Fix regexp.
 
-2005-09-18  D Goel  <deego@gnufans.org>
+2005-09-18  Deepak Goel  <deego@gnufans.org>
 
         * sieve.el (sieve-help): Fix `message' call: first arg should be a
         format spec.
@@ -125,9 +132,9 @@
 2005-09-07  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * spam-report.el (spam-report-gmane): Make it work without
-        X-Report-Spam header.  Gmane now only provides Archived-At.  This
-        is only used if `spam-report-gmane-use-article-number' is nil.
-        (spam-report-gmane-spam-header): Removed.  Not used anymore.
+        X-Report-Spam header.  Gmane now only provides Archived-At.
+        This is only used if `spam-report-gmane-use-article-number' is nil.
+        (spam-report-gmane-spam-header): Remove.  Not used anymore.
 
         * nnweb.el (nnweb-google-wash-article): Print a message if article
         is not available.
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 76a66268586..9d0bbdfeb63 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -222,7 +222,12 @@ before the external MIME handler is invoked."
     ("text/richtext" mm-inline-text identity)
     ("text/x-patch" mm-display-patch-inline
      (lambda (handle)
-       (locate-library "diff-mode")))
+       ;; If the diff-mode.el package is installed, the function is
+       ;; autoloaded.  Checking (locate-library "diff-mode") would be trying
+       ;; to cater to broken installations.  OTOH checking the function
+       ;; makes it possible to install another package which provides an
+       ;; alternative implementation of diff-mode.  --Stef
+       (fboundp 'diff-mode)))
     ("application/emacs-lisp" mm-display-elisp-inline identity)
     ("application/x-emacs-lisp" mm-display-elisp-inline identity)
     ("text/html"
@@ -451,21 +456,19 @@ If not set, `default-directory' will be used."
 (defvar mm-viewer-completion-map
   (let ((map (make-sparse-keymap 'mm-viewer-completion-map)))
     (set-keymap-parent map minibuffer-local-completion-map)
+    ;; Should we bind other key to minibuffer-complete-word?
+    (define-key map " " 'self-insert-command)
     map)
   "Keymap for input viewer with completion.")
 
-;; Should we bind other key to minibuffer-complete-word?
-(define-key mm-viewer-completion-map " " 'self-insert-command)
-
 (defvar mm-viewer-completion-map
   (let ((map (make-sparse-keymap 'mm-viewer-completion-map)))
     (set-keymap-parent map minibuffer-local-completion-map)
+    ;; Should we bind other key to minibuffer-complete-word?
+    (define-key map " " 'self-insert-command)
     map)
   "Keymap for input viewer with completion.")
 
-;; Should we bind other key to minibuffer-complete-word?
-(define-key mm-viewer-completion-map " " 'self-insert-command)
-
 ;;; The functions.
 
 (defun mm-alist-to-plist (alist)
@@ -564,7 +567,7 @@ Postpone undisplaying of viewers for types in
              ;; what really needs to be done here is a way to link a
              ;; MIME handle back to it's parent MIME handle (in a multilevel
              ;; MIME article).  That would probably require changing
-             ;; the mm-handle API so we simply store the multipart buffert
+             ;; the mm-handle API so we simply store the multipart buffer
              ;; name as a text property of the "multipart/whatever" string.
              (add-text-properties 0 (length (car ctl))
                                   (list 'buffer (mm-copy-to-buffer)
@@ -807,8 +810,7 @@ external if displayed external."
                                    (mm-mailcap-command
                                     method file (mm-handle-type handle)))
                      (if (buffer-live-p buffer)
-                         (save-excursion
-                           (set-buffer buffer)
+                         (with-current-buffer buffer
                            (buffer-string))))
                  (progn
                    (ignore-errors (delete-file file))