(Info-find-index-name): Search for a function definition with a return type.

2 files changed, 15 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1892ce94b87..83eed012720 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2002-07-25  Kevin Ryde  <user42@zip.com.au>
+
+        * info.el (Info-find-index-name): Search for a function definition
+        with a return type.
+
+2002-07-25  David Ponce  <david@dponce.com>
+
+        * emacs-lisp/bytecomp.el (byte-compile-set-symbol-position):
+        Don't recompute `entry' on each iteration.
+        (byte-compile-delete-first): Make it defsubst.
+
 2002-07-25  Sam Steingold  <sds@gnu.org>
 
         * progmodes/cc-engine.el (c-search-uplist-for-classkey): When
@@ -30,7 +41,6 @@
         * textmodes/reftex-sel.el (reftex-select-label-mode): likewise.
         (reftex-select-bib-mode): likewise
 
-
 2002-07-25  Colin Walters  <walters@debian.org>
 
         * ibuffer.el (ibuffer-mouse-popup-menu): Allow point to be moved
diff --git a/lisp/info.el b/lisp/info.el
index f95cd8bf7b6..07304eabb05 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1939,6 +1939,10 @@ Give a blank topic name to go to the Index node itself."
     (if (or (re-search-forward (format
                                 "[a-zA-Z]+: %s\\( \\|$\\)"
                                 (regexp-quote name)) nil t)
+            ;; Find a function definition with a return type.
+            (re-search-forward (format
+                                "[a-zA-Z]+: [a-zA-Z0-9_]+ %s\\( \\|$\\)"
+                                (regexp-quote name)) nil t)
             (search-forward (format "`%s'" name) nil t)
             (and (string-match "\\`.*\\( (.*)\\)\\'" name)
                  (search-forward