diff options
| author | Stephen Berman <stephen.berman@gmx.net> | 2016-01-21 11:19:21 +0100 |
|---|---|---|
| committer | Stephen Berman <stephen.berman@gmx.net> | 2016-01-21 11:19:21 +0100 |
| commit | 7bc7fd6058a28cdf7da672dc625c6d3f2e50aa1b (patch) | |
| tree | 658ef7f195a8d02026c7cf7f4c269bf90602ad7d /lisp/doc-view.el | |
| parent | 871c8b1b96c1cffb84d30dddd484663a0c94818f (diff) | |
| download | emacs-7bc7fd6058a28cdf7da672dc625c6d3f2e50aa1b.tar.gz emacs-7bc7fd6058a28cdf7da672dc625c6d3f2e50aa1b.tar.bz2 emacs-7bc7fd6058a28cdf7da672dc625c6d3f2e50aa1b.zip | |
Fix desktop support in todo-mode and doc-view (bug#22377)
* lisp/calendar/todo-mode.el (todo-restore-desktop-buffer):
* lisp/doc-view.el (doc-view-restore-desktop-buffer): Return current buffer.
* lisp/calendar/todo-mode.el (todo-modes-set-2):
* lisp/doc-view.el (doc-view-mode): Set desktop-save-buffer unconditionally.
Diffstat (limited to 'lisp/doc-view.el')
| -rw-r--r-- | lisp/doc-view.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/doc-view.el b/lisp/doc-view.el index 286811358fb..06cf8dcef3a 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -1714,7 +1714,8 @@ If BACKWARD is non-nil, jump to the previous match." ;; window-parameters in the window-state(s) and then restoring this ;; window-state should call us back (to interpret/use those parameters). (doc-view-goto-page page) - (when slice (apply 'doc-view-set-slice slice))))) + (when slice (apply 'doc-view-set-slice slice)) + (current-buffer)))) (add-to-list 'desktop-buffer-mode-handlers '(doc-view-mode . doc-view-restore-desktop-buffer)) @@ -1788,9 +1789,7 @@ toggle between displaying the document or editing it as text. nil t) (add-hook 'clone-indirect-buffer-hook 'doc-view-clone-buffer-hook nil t) (add-hook 'kill-buffer-hook 'doc-view-kill-proc nil t) - (when (and (boundp 'desktop-save-mode) - desktop-save-mode) - (setq-local desktop-save-buffer 'doc-view-desktop-save-buffer)) + (setq-local desktop-save-buffer 'doc-view-desktop-save-buffer) (remove-overlays (point-min) (point-max) 'doc-view t) ;Just in case. ;; Keep track of display info ([vh]scroll, page number, overlay, |