(Info-find-emacs-command-nodes): Adapt to Texinfo-4.7 style indexes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d7a3b8c175913af2e076e8da039bc71d4b296fd..7297a2bc3f799fcb44663ccc774d0e846d520084 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-24  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * info.el (Info-find-emacs-command-nodes): Adapt to Texinfo-4.7
+       style indexes.
+
 2004-10-24  Kai Grossjohann  <kai.grossjohann@gmx.net>
 
        * simple.el (process-file): Accept nil for INFILE.  Reported by

diff --git a/lisp/info.el b/lisp/info.el
index 17905c6d738cc4be2e461892d7d2fcd160899d59..4fc7b5c9cf7499eef76926444d1d33a66fa04ae1 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3248,7 +3248,8 @@ The locations are of the format used in `Info-history', i.e.
 \(FILENAME NODENAME BUFFERPOS\)."
   (let ((where '())
        (cmd-desc (concat "^\\* +" (regexp-quote (symbol-name command))
-                         "\\( <[0-9]+>\\)?:\\s *\\(.*\\)\\.$"))
+                         "\\( <[0-9]+>\\)?:\\s *\\(.*\\)\\."
+                         "\\([ \t]*(line[ \t]*[0-9]*)\\)?$"))
        (info-file "emacs"))            ;default
     ;; Determine which info file this command is documented in.
     (if (get command 'info-file)