mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

(Info-goto-index): One register one step in the history.

Browse source 
(Info-index): Don't protect the history around the call to Info-goto-index.
This commit is contained in:
Stefan Monnier 2001-11-29 23:46:01 +00:00
parent e4e8ee638e
commit e700ec12bd
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/ChangeLog
View file

@ -1,3 +1,12 @@
2001-11-29 Stefan Monnier <monnier@cs.yale.edu>
* info.el (Info-complete-next-re, Info-complete-cache): New vars.
(Info-complete-menu-item): Rewrite. Add the ability to search
several sequential nodes. Add a simple caching mechanism.
(Info-goto-index): New function extracted from Info-index.
(Info-index): Use it. Add completion to the interactive spec.
(Info-menu-update): Simplify call to `Info-complete-menu-item'.
2001-11-29 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
* COPYING: Removed.
@ -19,8 +28,7 @@
* play/blackbox.el (blackbox-mode, blackbox): Doc fix.
* play/cookie1.el (cookie, cookie-insert, shuffle-vector): Doc
fixes.
* play/cookie1.el (cookie, cookie-insert, shuffle-vector): Doc fixes.
* play/studly.el (studlify-word, studlify-region)
(studlify-buffer): Fix doc-string.

16
lisp/info.el
View file

@ -1831,7 +1831,9 @@ parent node."
(or (re-search-forward "\n\\* \\(.*\\<Index\\>\\)" nil t)
(error "No index"))
(goto-char (match-beginning 1))
(Info-goto-node (Info-extract-menu-node-name)))
;; Protect Info-history so that the current node (Top) is not added to it.
(let ((Info-history nil))
(Info-goto-node (Info-extract-menu-node-name))))
(defun Info-index (topic)
"Look up a string TOPIC in the index for this file.
@ -1857,16 +1859,14 @@ Give a blank topic name to go to the Index node itself."
(regexp-quote topic)))
node
(case-fold-search t))
;; Here, and subsequently in this function,
;; we bind Info-history to nil for internal node-switches
;; so that we don't put junk in the history.
;; In the first Info-goto-node call, above, we do update the history
;; because that is what the user's previous node choice into it.
(let ((Info-history nil))
(Info-goto-index))
(Info-goto-index)
(or (equal topic "")
(let ((matches nil)
(exact nil)
;; We bind Info-history to nil for internal node-switches so
;; that we don't put junk in the history. In the first
;; Info-goto-index call, above, we do update the history
;; because that is what the user's previous node choice into it.
(Info-history nil)
found)
(while