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

[Stefan Monnier]

Index: emacs/lisp/gnus/mm-decode.el
diff -c emacs/lisp/gnus/mm-decode.el:1.27 emacs/lisp/gnus/mm-decode.el:1.28
*** emacs/lisp/gnus/mm-decode.el:1.27   Wed Sep 28 05:26:02 2005
--- emacs/lisp/gnus/mm-decode.el        Sat Oct  1 04:00:50 2005
***************
*** 222,228 ****
      ("text/richtext" mm-inline-text identity)
      ("text/x-patch" mm-display-patch-inline
       (lambda (handle)
!        (locate-library "diff-mode")))
      ("application/emacs-lisp" mm-display-elisp-inline identity)
      ("application/x-emacs-lisp" mm-display-elisp-inline identity)
      ("text/html"
--- 222,233 ----
      ("text/richtext" mm-inline-text identity)
      ("text/x-patch" mm-display-patch-inline
       (lambda (handle)
!        ;; 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,471 ****
  (defvar mm-viewer-completion-map
    (let ((map (make-sparse-keymap 'mm-viewer-completion-map)))
      (set-keymap-parent map minibuffer-local-completion-map)
      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)
      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)
--- 456,474 ----
  (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.")
  
  (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.")
  
  ;;; The functions.
  
  (defun mm-alist-to-plist (alist)
***************
*** 564,570 ****
             ;; 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
             ;; name as a text property of the "multipart/whatever" string.
             (add-text-properties 0 (length (car ctl))
                                  (list 'buffer (mm-copy-to-buffer)
--- 567,573 ----
             ;; 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 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,814 ****
                                   (mm-mailcap-command
                                    method file (mm-handle-type handle)))
                     (if (buffer-live-p buffer)
!                        (save-excursion
!                          (set-buffer buffer)
                           (buffer-string))))
                 (progn
                   (ignore-errors (delete-file file))
--- 810,816 ----
                                   (mm-mailcap-command
                                    method file (mm-handle-type handle)))
                     (if (buffer-live-p buffer)
!                        (with-current-buffer buffer
                           (buffer-string))))
                 (progn
                   (ignore-errors (delete-file file))