aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1998-03-17 06:29:50 +0000
committerRichard M. Stallman1998-03-17 06:29:50 +0000
commit6d2c8e3eb7baecca2fccdf8178985d33484cd4d5 (patch)
tree6ed5fdae6cac6267aeff8f7f0779d9689e5d47d7
parent25d90e68d01beb215cf61d102134a42fc8a27000 (diff)
downloademacs-6d2c8e3eb7baecca2fccdf8178985d33484cd4d5.tar.gz
emacs-6d2c8e3eb7baecca2fccdf8178985d33484cd4d5.zip
(Info-menu-update): Set Info-menu-last-node
to (FILE NODENAME), and test it that way too.
-rw-r--r--lisp/info.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/info.el b/lisp/info.el
index a50b0c09112..a7c395ef2b8 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1685,12 +1685,14 @@ If no reference to follow, moves to the next node, or up if none."
1685 1685
1686(defvar Info-menu-last-node nil) 1686(defvar Info-menu-last-node nil)
1687;; Last node the menu was created for. 1687;; Last node the menu was created for.
1688;; Value is a list, (FILE-NAME NODE-NAME).
1688 1689
1689(defun Info-menu-update () 1690(defun Info-menu-update ()
1690 ;; Update the Info menu for the current node. 1691 ;; Update the Info menu for the current node.
1691 (condition-case nil 1692 (condition-case nil
1692 (if (or (not (eq major-mode 'Info-mode)) 1693 (if (or (not (eq major-mode 'Info-mode))
1693 (eq Info-current-node Info-menu-last-node)) 1694 (equal (list Info-current-file Info-current-node)
1695 Info-menu-last-node))
1694 () 1696 ()
1695 ;; Update menu menu. 1697 ;; Update menu menu.
1696 (let* ((Info-complete-menu-buffer (current-buffer)) 1698 (let* ((Info-complete-menu-buffer (current-buffer))
@@ -1745,7 +1747,7 @@ If no reference to follow, moves to the next node, or up if none."
1745 (setq entries (list ["No references" nil nil]))) 1747 (setq entries (list ["No references" nil nil])))
1746 (easy-menu-change '("Info") "Reference" (nreverse entries))) 1748 (easy-menu-change '("Info") "Reference" (nreverse entries)))
1747 ;; Update last seen node. 1749 ;; Update last seen node.
1748 (setq Info-menu-last-node (current-buffer))) 1750 (setq Info-menu-last-node (list Info-current-file Info-current-node)))
1749 ;; Try to avoid entering infinite beep mode in case of errors. 1751 ;; Try to avoid entering infinite beep mode in case of errors.
1750 (error (ding)))) 1752 (error (ding))))
1751 1753