aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2015-02-05 10:26:57 -0500
committerStefan Monnier2015-02-05 10:26:57 -0500
commit14500c83b8e4ea20efdc3ea32499d2fb2e0d9253 (patch)
tree7b516c7a29fc3aadefcaad541d807a0463b4917a
parent49aa3a12ccf0ceea3961edaec9cd00dc6038fc79 (diff)
downloademacs-14500c83b8e4ea20efdc3ea32499d2fb2e0d9253.tar.gz
emacs-14500c83b8e4ea20efdc3ea32499d2fb2e0d9253.zip
* lisp/doc-view.el: Add some comments about desktop support
-rw-r--r--lisp/doc-view.el8
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 0e63d37adc5..b718f1d8b2c 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -1685,6 +1685,9 @@ If BACKWARD is non-nil, jump to the previous match."
1685;; desktop.el integration 1685;; desktop.el integration
1686 1686
1687(defun doc-view-desktop-save-buffer (_desktop-dirname) 1687(defun doc-view-desktop-save-buffer (_desktop-dirname)
1688 ;; FIXME: This is wrong, since this info is per-window but we only do it once
1689 ;; here for the buffer. IOW it should be saved via something like
1690 ;; `window-persistent-parameters'.
1688 `((page . ,(doc-view-current-page)) 1691 `((page . ,(doc-view-current-page))
1689 (slice . ,(doc-view-current-slice)))) 1692 (slice . ,(doc-view-current-slice))))
1690 1693
@@ -1695,8 +1698,13 @@ If BACKWARD is non-nil, jump to the previous match."
1695 (let ((page (cdr (assq 'page misc))) 1698 (let ((page (cdr (assq 'page misc)))
1696 (slice (cdr (assq 'slice misc)))) 1699 (slice (cdr (assq 'slice misc))))
1697 (desktop-restore-file-buffer file name misc) 1700 (desktop-restore-file-buffer file name misc)
1701 ;; FIXME: We need to run this code after displaying the buffer.
1698 (with-selected-window (or (get-buffer-window (current-buffer) 0) 1702 (with-selected-window (or (get-buffer-window (current-buffer) 0)
1699 (selected-window)) 1703 (selected-window))
1704 ;; FIXME: This should be done for all windows restored that show
1705 ;; this buffer. Basically, the page/slice should be saved as
1706 ;; window-parameters in the window-state(s) and then restoring this
1707 ;; window-state should call us back (to interpret/use those parameters).
1700 (doc-view-goto-page page) 1708 (doc-view-goto-page page)
1701 (when slice (apply 'doc-view-set-slice slice))))) 1709 (when slice (apply 'doc-view-set-slice slice)))))
1702 1710