[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/info.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/info.el |
Date: |
Thu, 29 Nov 2001 18:44:01 -0500 |
Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.285 emacs/lisp/info.el:1.286
*** emacs/lisp/info.el:1.285 Thu Nov 29 18:20:49 2001
--- emacs/lisp/info.el Thu Nov 29 18:44:01 2001
***************
*** 1831,1837 ****
(or (re-search-forward "\n\\* \\(.*\\<Index\\>\\)" nil t)
(error "No index"))
(goto-char (match-beginning 1))
! (Info-goto-node (Info-extract-menu-node-name)))
(defun Info-index (topic)
"Look up a string TOPIC in the index for this file.
--- 1831,1839 ----
(or (re-search-forward "\n\\* \\(.*\\<Index\\>\\)" nil t)
(error "No index"))
(goto-char (match-beginning 1))
! ;; 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,1872 ****
(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))
(or (equal topic "")
(let ((matches nil)
(exact nil)
(Info-history nil)
found)
(while
--- 1859,1872 ----
(regexp-quote topic)))
node
(case-fold-search t))
! (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