aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2003-05-11 15:30:12 +0000
committerJuanma Barranquero2003-05-11 15:30:12 +0000
commitbdb0f2d5510b9941d844c12d3f64bcd76087ec9c (patch)
tree1dc233c0343a9abde8b9f30b6b30b5947073560c
parent9465a86c76ea0a26cfa923d968fb59dde2f541cf (diff)
downloademacs-bdb0f2d5510b9941d844c12d3f64bcd76087ec9c.tar.gz
emacs-bdb0f2d5510b9941d844c12d3f64bcd76087ec9c.zip
(info-lookup-make-completions): Allow colons in index entries by looking for ":
" to terminate, as per latest info.el.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/info-look.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 82a10a819fe..4cc00d924dc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12003-05-11 Kevin Ryde <user42@zip.com.au>
2
3 * info-look.el (info-lookup-make-completions): Allow colons in index
4 entries by looking for ": " to terminate, as per latest info.el.
5
12003-05-10 Stefan Monnier <monnier@cs.yale.edu> 62003-05-10 Stefan Monnier <monnier@cs.yale.edu>
2 7
3 * newcomment.el (comment-indent): Try to align to adjacent comments. 8 * newcomment.el (comment-indent): Try to align to adjacent comments.
diff --git a/lisp/info-look.el b/lisp/info-look.el
index b4a8d3be6a8..e81d33e65f2 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -1,7 +1,7 @@
1;;; info-look.el --- major-mode-sensitive Info index lookup facility 1;;; info-look.el --- major-mode-sensitive Info index lookup facility
2;; An older version of this was known as libc.el. 2;; An older version of this was known as libc.el.
3 3
4;; Copyright (C) 1995,96,97,98,99,2001 Free Software Foundation, Inc. 4;; Copyright (C) 1995,96,97,98,99,2001,2003 Free Software Foundation, Inc.
5 5
6;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org> 6;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
7;; (did not show signs of life (Nov 2001) -stef) 7;; (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."
468 (progn 468 (progn
469 (goto-char (point-min)) 469 (goto-char (point-min))
470 (and (search-forward "\n* Menu:" nil t) 470 (and (search-forward "\n* Menu:" nil t)
471 (while (re-search-forward "\n\\* \\([^:\t\n]*\\):" nil t) 471 (while (re-search-forward "\n\\* \\(.*\\): " nil t)
472 (setq entry (match-string 1) 472 (setq entry (match-string 1)
473 item (funcall trans entry)) 473 item (funcall trans entry))
474 ;; `trans' can return nil if the regexp doesn't match. 474 ;; `trans' can return nil if the regexp doesn't match.