mm-view.el (mm-display-inline-fontify): Don't run doc-view-mode because it displays...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9d22d52e57957d28f863f9d97d0656c7caba02ff..f3a6024069e8673e22ad71332b7eaeb3c75f9ba0 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-view.el (mm-display-inline-fontify): Don't run doc-view-mode
+       because it displays images using overlays that aren't easy to copy to
+       the article buffer.
+
 2011-09-20  Łukasz Stelmach  <lukasz.stelmach@iem.pw.edu.pl>  (tiny change)
 
        * message.el (message-indent-citation): Fix empty line removal at the

diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 926422865c7460f78cc33285ae5d6b28409519c3..6358e34176f3b46dd1aa0cd35ad6637de2c06b95 100644 (file)
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -607,7 +607,10 @@ If MODE is not set, try to find mode automatically."
         (set (make-local-variable 'enable-local-variables) nil)
         (if mode
             (funcall mode)
-          (set-auto-mode))
+         (let ((auto-mode-alist
+                (delq (rassq 'doc-view-mode-maybe auto-mode-alist)
+                      (copy-sequence auto-mode-alist))))
+           (set-auto-mode)))
        ;; The mode function might have already turned on font-lock.
         ;; Do not fontify if the guess mode is fundamental.
        (unless (or (symbol-value 'font-lock-mode)