diff options
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/doc-view.el | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a3b6b604480..054ff8d268b 100644 --- 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 afb2e48b145..0580e106012 100644 --- 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 |