diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-11-29 23:46:01 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-11-29 23:46:01 +0000 |
| commit | e700ec12bdeae48e917af0c3b94dd4dc3be2c8fc (patch) | |
| tree | 201f814a47be43c50a7579b56ac64b5ae3f85925 | |
| parent | e4e8ee638ec1500f33a546b892cd78a1988ee36f (diff) | |
| download | emacs-e700ec12bdeae48e917af0c3b94dd4dc3be2c8fc.tar.gz | |
(Info-goto-index): One register one step in the history.
(Info-index): Don't protect the history around the call to Info-goto-index.
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/info.el | 16 |
2 files changed, 18 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c40bd82204d..55f9f49edf0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/info.el b/lisp/info.el index 1c6242375de..2f9d6e02024 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -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 |