(Info-find-index-name): Search both with and without the " <1>" etc.

suffixes which makeinfo appends to duplicate index entries.

diff --git a/lisp/info.el b/lisp/info.el
index 5777bc4451e152cf4cd42bae8fcccc8a7156a6dd..800ee86cbeda8865ead1a80ac662225b4fa60037 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2112,8 +2112,11 @@ Give a blank topic name to go to the Index node itself."
                 (search-forward
                  (format "`%s'" (substring name 0 (match-beginning 1)))
                  nil t))
-           (search-forward name nil t))
-       (beginning-of-line)
+           (search-forward name nil t)
+           ;; Try again without the " <1>" makeinfo can append
+            (and (string-match "\\`\\(.*\\) <[0-9]+>\\'" name)
+                 (Info-find-index-name (match-string 1 name))))
+       (progn (beginning-of-line) t)  ;; non-nil for recursive call
       (goto-char (point-min)))))
 
 (defun Info-undefined ()