[Emacs-diffs] emacs/lisp ChangeLog doc-view.el

[Tassilo Horn]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Tassilo Horn <tsdh>     09/11/24 07:47:49

Modified files:
        lisp           : ChangeLog doc-view.el 

Log message:
                * doc-view.el (doc-view-mode): Switch off view-mode explicitly,
                because it could be enabled automatically if view-read-only is
                non-nil.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16714&r2=1.16715
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/doc-view.el?cvsroot=emacs&r1=1.89&r2=1.90

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16714
retrieving revision 1.16715
diff -u -b -r1.16714 -r1.16715
--- ChangeLog   24 Nov 2009 03:16:38 -0000      1.16714
+++ ChangeLog   24 Nov 2009 07:47:45 -0000      1.16715
@@ -1,3 +1,9 @@
+2009-11-24  Tassilo Horn  <address@hidden>
+
+       * 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  <address@hidden>
        
        * ediff-vers.el (ediff-rcs-get-output-buffer): Revert the change

Index: doc-view.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/doc-view.el,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- doc-view.el 23 Nov 2009 20:34:57 -0000      1.89
+++ doc-view.el 24 Nov 2009 07:47:49 -0000      1.90
@@ -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