(info-lookup-make-completions): Allow colons in index entries by looking for ":

" to terminate, as per latest info.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 82a10a819fe81b89f5d363088dccf09c4ba19420..4cc00d924dc9fee7f525f46df4f7f3dee1102dc6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-11  Kevin Ryde  <user42@zip.com.au>
+
+       * info-look.el (info-lookup-make-completions): Allow colons in index
+       entries by looking for ": " to terminate, as per latest info.el.
+
 2003-05-10  Stefan Monnier  <monnier@cs.yale.edu>
 
        * newcomment.el (comment-indent): Try to align to adjacent comments.

diff --git a/lisp/info-look.el b/lisp/info-look.el
index b4a8d3be6a8a678cb5c81e98aa0f9e368cfe1efa..e81d33e65f2f65c5f9b3c012f876b3b0675620b7 100644 (file)
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -1,7 +1,7 @@
 ;;; info-look.el --- major-mode-sensitive Info index lookup facility
 ;; An older version of this was known as libc.el.
 
-;; Copyright (C) 1995,96,97,98,99,2001  Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98,99,2001,2003  Free Software Foundation, Inc.
 
 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
 ;;         (did not show signs of life (Nov 2001)  -stef)
@@ -468,7 +468,7 @@ If optional argument QUERY is non-nil, query for the help mode."
              (progn
                (goto-char (point-min))
                (and (search-forward "\n* Menu:" nil t)
-                    (while (re-search-forward "\n\\* \\([^:\t\n]*\\):" nil t)
+                    (while (re-search-forward "\n\\* \\(.*\\): " nil t)
                       (setq entry (match-string 1)
                             item (funcall trans entry))
                       ;; `trans' can return nil if the regexp doesn't match.