changeset 106214:8653ee602137

* doc-view.el (doc-view-mode): Switch off view-mode explicitly, because it could be enabled automatically if view-read-only is non-nil.
author Tassilo Horn <tassilo@member.fsf.org>
date Tue, 24 Nov 2009 07:47:45 +0000
parents 74565da884e6
children da3ca3481c0b
files lisp/ChangeLog lisp/doc-view.el
diffstat 2 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Nov 24 03:16:38 2009 +0000
+++ b/lisp/ChangeLog	Tue Nov 24 07:47:45 2009 +0000
@@ -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
--- a/lisp/doc-view.el	Tue Nov 24 03:16:38 2009 +0000
+++ b/lisp/doc-view.el	Tue Nov 24 07:47:45 2009 +0000
@@ -1254,6 +1254,11 @@
 	  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