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

[Miles Bader]

Index: emacs/lisp/gnus/mm-view.el
diff -c emacs/lisp/gnus/mm-view.el:1.7.4.4 emacs/lisp/gnus/mm-view.el:1.7.4.5
*** emacs/lisp/gnus/mm-view.el:1.7.4.4  Thu Sep 16 00:12:16 2004
--- emacs/lisp/gnus/mm-view.el  Mon Oct 25 04:22:24 2004
***************
*** 199,211 ****
    (setq w3m-display-inline-images mm-inline-text-html-with-images))
  
  (defun mm-w3m-cid-retrieve-1 (url handle)
!   (if (mm-multiple-handles handle)
!       (dolist (elem handle)
!       (mm-w3m-cid-retrieve-1 url elem))
!     (when (and (listp handle)
!              (equal url (mm-handle-id handle)))
!       (mm-insert-part handle)
!       (throw 'found-handle (mm-handle-media-type handle)))))
  
  (defun mm-w3m-cid-retrieve (url &rest args)
    "Insert a content pointed by URL if it has the cid: scheme."
--- 199,212 ----
    (setq w3m-display-inline-images mm-inline-text-html-with-images))
  
  (defun mm-w3m-cid-retrieve-1 (url handle)
!   (dolist (elem handle)
!     (when (listp elem)
!       (if (equal url (mm-handle-id elem))
!         (progn
!           (mm-insert-part elem)
!           (throw 'found-handle (mm-handle-media-type elem))))
!       (if (equal "multipart" (mm-handle-media-supertype elem))
!         (mm-w3m-cid-retrieve-1 url elem)))))
  
  (defun mm-w3m-cid-retrieve (url &rest args)
    "Insert a content pointed by URL if it has the cid: scheme."
***************
*** 465,472 ****
          (progn
            (buffer-disable-undo)
            (mm-insert-part handle)
-           (funcall mode)
            (require 'font-lock)
            (let ((font-lock-verbose nil))
              ;; I find font-lock a bit too verbose.
              (font-lock-fontify-buffer))
--- 466,477 ----
          (progn
            (buffer-disable-undo)
            (mm-insert-part handle)
            (require 'font-lock)
+           ;; Inhibit font-lock this time (*-mode-hook might run
+           ;; `turn-on-font-lock') so that jit-lock may not turn off
+           ;; font-lock immediately after this.
+           (let ((font-lock-mode t))
+             (funcall mode))
            (let ((font-lock-verbose nil))
              ;; I find font-lock a bit too verbose.
              (font-lock-fontify-buffer))