* lisp/doc-view.el: Preserve h&v scroll across C-c C-c C-c C-c.

(doc-view-fallback-mode): Remove overlays here.
(doc-view-toggle-display): Instead of here.  Don't throw away
image-mode-winprops-alist.
(doc-view-goto-page): Don't mess with hscroll.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 822a4a268704634bc24c0a94ccce210597597d74..d12c704330384860f68caa31238d5612231495af 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * doc-view.el: Preserve h&v scroll across C-c C-c C-c C-c.
+       (doc-view-fallback-mode): Remove overlays here.
+       (doc-view-toggle-display): Instead of here.  Don't throw away
+       image-mode-winprops-alist.
+       (doc-view-goto-page): Don't mess with hscroll.
+
 2013-02-27  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
        * font-lock.el (lisp-font-lock-keywords-2): Fix highlighting of

diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 89d2edd3dbb429edaa9e00d71720c59e165f94a2..0cfdc9a22d1f05cae9bfd77e3eec73ac5b8dac63 100644 (file)
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -485,8 +485,7 @@ Typically \"page-%s.png\".")
 (defun doc-view-goto-page (page)
   "View the page given by PAGE."
   (interactive "nPage: ")
-  (let ((len (doc-view-last-page-number))
-       (hscroll (window-hscroll)))
+  (let ((len (doc-view-last-page-number)))
     (if (< page 1)
        (setq page 1)
       (when (and (> page len)
@@ -520,7 +519,6 @@ Typically \"page-%s.png\".")
                  (format doc-view--image-file-pattern page)
                  (doc-view-current-cache-dir))))
       (doc-view-insert-image file :pointer 'arrow)
-      (set-window-hscroll (selected-window) hscroll)
       (when (and (not (file-exists-p file))
                  doc-view-current-converter-processes)
         ;; The PNG file hasn't been generated yet.
@@ -1381,8 +1379,6 @@ For now these keys are useful:
       (progn
        (doc-view-kill-proc)
        (setq buffer-read-only nil)
-       (remove-overlays (point-min) (point-max) 'doc-view t)
-       (setq-local image-mode-winprops-alist t)
        ;; Switch to the previously used major mode or fall back to
        ;; normal mode.
        (doc-view-fallback-mode)
@@ -1725,6 +1721,7 @@ toggle between displaying the document or editing it as text.
                   (mapcar (lambda (var) (cons var (symbol-value var)))
                           '(doc-view-resolution
                             image-mode-winprops-alist)))))
+    (remove-overlays (point-min) (point-max) 'doc-view t)
     (if doc-view-previous-major-mode
         (funcall doc-view-previous-major-mode)
       (let ((auto-mode-alist