diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-02-27 23:02:36 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-02-27 23:02:36 -0500 |
| commit | e7a1c32dda4ec7d937e9810b23584945286f2e25 (patch) | |
| tree | 0ed1253b2218aabd6055df54965e3ac4385d0892 | |
| parent | 0e9467861c23f830d74174dcde69a4f7d4074cac (diff) | |
| download | emacs-e7a1c32dda4ec7d937e9810b23584945286f2e25.tar.gz | |
* 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.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/doc-view.el | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 822a4a26870..d12c7043303 100644 --- 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 89d2edd3dbb..0cfdc9a22d1 100644 --- 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 |