* doc-view.el (doc-view-mode): Switch off view-mode explicitly,

	because it could be enabled automatically if view-read-only is
	non-nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3b6b6044808e8df1a2775b01fc688b9640ffbf2..054ff8d268b794a6f5c4e4806a3578dec2349c6a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,14 @@
+2009-11-24  Tassilo Horn  <tassilo@member.fsf.org>
+
+       * doc-view.el (doc-view-mode): Switch off view-mode explicitly,
+       because it could be enabled automatically if view-read-only is
+       non-nil.
+
 2009-11-24  Michael Kifer  <kifer@cs.stonybrook.edu>
-       
+
        * ediff-vers.el (ediff-rcs-get-output-buffer): Revert the change
        made on 2009-11-22.
-       
+
 2009-11-24  Glenn Morris  <rgm@gnu.org>
 
        * bookmark.el (bookmark-bmenu-hide-filenames): Remove assignment to

diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index afb2e48b145fe34d263461897002a1eb90e95a84..0580e1060123f8b1ceb01bd292afbfc3c23d6c12 100644 (file)
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -1254,6 +1254,11 @@ toggle between displaying the document or editing it as text.
          buffer-read-only t
          major-mode 'doc-view-mode)
     (doc-view-initiate-display)
+    ;; Switch off view-mode explicitly, because doc-view-mode is the
+    ;; canonical view mode for PDF/PS/DVI files.  This could be
+    ;; switched on automatically depending on the value of
+    ;; `view-read-only'.
+    (view-mode -1)
     (run-mode-hooks 'doc-view-mode-hook)))
 
 ;;;###autoload