Commit 56cda6f5 authored by Richard M. Stallman's avatar Richard M. Stallman

(Info-next-reference, Info-prev-reference): Add optional

argument RECUR to avoid infinite recursion on malformed nodes.
parent 8b09046c
...@@ -1242,7 +1242,7 @@ previous node or back up to the parent node." ...@@ -1242,7 +1242,7 @@ previous node or back up to the parent node."
(Info-last-preorder) (Info-last-preorder)
(scroll-down)))) (scroll-down))))
(defun Info-next-reference () (defun Info-next-reference (&optional recur)
"Move cursor to the next cross-reference or menu item in the node." "Move cursor to the next cross-reference or menu item in the node."
(interactive) (interactive)
(let ((pat "\\*note[ \n\t]*\\([^:]*\\):\\|^\\* .*:") (let ((pat "\\*note[ \n\t]*\\([^:]*\\):\\|^\\* .*:")
...@@ -1257,9 +1257,11 @@ previous node or back up to the parent node." ...@@ -1257,9 +1257,11 @@ previous node or back up to the parent node."
(error "No cross references in this node"))))) (error "No cross references in this node")))))
(goto-char (match-beginning 0)) (goto-char (match-beginning 0))
(if (looking-at "\\* Menu:") (if (looking-at "\\* Menu:")
(Info-next-reference)))) (if recur
(error "No cross references in this node")
(Info-next-reference t)))))
(defun Info-prev-reference () (defun Info-prev-reference (&optional recur)
"Move cursor to the previous cross-reference or menu item in the node." "Move cursor to the previous cross-reference or menu item in the node."
(interactive) (interactive)
(let ((pat "\\*note[ \n\t]*\\([^:]*\\):\\|^\\* .*:") (let ((pat "\\*note[ \n\t]*\\([^:]*\\):\\|^\\* .*:")
...@@ -1273,7 +1275,9 @@ previous node or back up to the parent node." ...@@ -1273,7 +1275,9 @@ previous node or back up to the parent node."
(error "No cross references in this node"))))) (error "No cross references in this node")))))
(goto-char (match-beginning 0)) (goto-char (match-beginning 0))
(if (looking-at "\\* Menu:") (if (looking-at "\\* Menu:")
(Info-prev-reference)))) (if recur
(error "No cross references in this node")
(Info-prev-reference t)))))
(defun Info-index (topic) (defun Info-index (topic)
"Look up a string in the index for this file. "Look up a string in the index for this file.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment