procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add slow' and history' tags to the desktop data.

Browse source 
* info.el (Info-virtual-nodes) [*Index*]: Add `slow' tag.
(Info-virtual-files) [*Apropos*]: Add `slow' tag.
(Info-finder-find-node): Require `finder.el' to be able
to restore node from the desktop.
(Info-desktop-buffer-misc-data): Save all nodes.  Save additional
data `Info-history' and `slow' tag in the assoc list.
(Info-restore-desktop-buffer): Don't restore nodes with the
`slow' tag.  Restore `Info-history'.
This commit is contained in:
Juri Linkov 2010-05-06 00:56:15 +03:00
parent 774b9a602e
commit 221a0647a2
2 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/ChangeLog
View file

@ -1,3 +1,16 @@
2010-05-05 Juri Linkov <juri@jurta.org>
Add `slow' and `history' tags to the desktop data.
* info.el (Info-virtual-nodes) [*Index*]: Add `slow' tag.
(Info-virtual-files) [*Apropos*]: Add `slow' tag.
(Info-finder-find-node): Require `finder.el' to be able
to restore node from the desktop.
(Info-desktop-buffer-misc-data): Save all nodes. Save additional
data `Info-history' and `slow' tag in the assoc list.
(Info-restore-desktop-buffer): Don't restore nodes with the
`slow' tag. Restore `Info-history'.
2010-05-05 Michael Albinus <michael.albinus@gmx.de>
Add FORCE argument to `delete-file'.

37
lisp/info.el
View file

@ -3104,6 +3104,7 @@ Give an empty topic name to go to the Index node itself."
(add-to-list 'Info-virtual-nodes
'("\\`\\*Index.*\\*\\'"
(find-node . Info-virtual-index-find-node)
(slow . t)
))
(defvar Info-virtual-index-nodes nil
@ -3193,6 +3194,7 @@ search results."
(toc-nodes . Info-apropos-toc-nodes)
(find-file . Info-apropos-find-file)
(find-node . Info-apropos-find-node)
(slow . t)
))
(defvar Info-apropos-file "*Apropos*"
@ -3348,6 +3350,7 @@ Build a menu of the possible matches."
(defun Info-finder-find-node (filename nodename &optional no-going-back)
"Finder-specific implementation of Info-find-node-2."
(require 'finder)
(cond
((equal nodename "Top")
;; Display Top menu with descriptions of the keywords
@ -4836,21 +4839,35 @@ BUFFER is the buffer speedbar is requesting buttons for."
(defun Info-desktop-buffer-misc-data (desktop-dirname)
"Auxiliary information to be saved in desktop file."
(unless (Info-virtual-file-p Info-current-file)
(list Info-current-file Info-current-node)))
(list Info-current-file
Info-current-node
;; Additional data as an association list.
(delq nil (list
(and Info-history
(cons 'history Info-history))
(and (Info-virtual-fun
'slow Info-current-file Info-current-node)
(cons 'slow t))))))
(defun Info-restore-desktop-buffer (desktop-buffer-file-name
desktop-buffer-name
desktop-buffer-misc)
"Restore an Info buffer specified in a desktop file."
(let ((first (nth 0 desktop-buffer-misc))
(second (nth 1 desktop-buffer-misc)))
(when (and first second)
(when desktop-buffer-name
(set-buffer (get-buffer-create desktop-buffer-name))
(Info-mode))
(Info-find-node first second)
(current-buffer))))
(let* ((file (nth 0 desktop-buffer-misc))
(node (nth 1 desktop-buffer-misc))
(data (nth 2 desktop-buffer-misc))
(hist (assq 'history data))
(slow (assq 'slow data)))
;; Don't restore nodes slow to regenerate.
(unless slow
(when (and file node)
(when desktop-buffer-name
(set-buffer (get-buffer-create desktop-buffer-name))
(Info-mode))
(Info-find-node file node)
(when hist
(setq Info-history (cdr hist)))
(current-buffer)))))
(add-to-list 'desktop-buffer-mode-handlers
'(Info-mode . Info-restore-desktop-buffer))