From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Wed, 21 Sep 2011 02:13:03 +0000 (+0000)
Subject: mm-view.el (mm-display-inline-fontify): Don't run doc-view-mode because it displays... 
X-Git-Tag: emacs-pretest-24.0.90~61
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=44cb0cc9672c2e6168ef3ba06496f9e3c478d716;p=emacs.git

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.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9d22d52e579..f3a6024069e 100644
--- 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 926422865c7..6358e34176f 100644
--- 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)