Mercurial > emacs
changeset 23365:d400637428d1
Remove duplicate scheme-mode entry.
(info-lookup-make-completions): When looking for entries, check
that `item' isn't null or "Menu".
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Fri, 02 Oct 1998 14:35:09 +0000 |
| parents | aa359fe9fe1e |
| children | 431ec936e2da |
| files | lisp/info-look.el |
| diffstat | 1 files changed, 12 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/info-look.el Thu Oct 01 21:01:15 1998 +0000 +++ b/lisp/info-look.el Fri Oct 02 14:35:09 1998 +0000 @@ -454,12 +454,17 @@ (while (re-search-forward "\n\\* \\([^:\t\n]*\\):" nil t) (setq entry (match-string 1) item (funcall trans entry)) - (and (info-lookup->ignore-case topic mode) - (setq item (downcase item))) - (and (string-equal entry item) - (setq entry nil)) - (or (assoc item result) - (setq result (cons (cons item entry) result)))))) + ;; `trans' can return nil if the regexp doesn't match. + (when (and item + ;; Sometimes there's more than one Menu: + (not (string= entry "Menu"))) + (and (info-lookup->ignore-case topic mode) + (setq item (downcase item))) + (and (string-equal entry item) + (setq entry nil)) + (and (or (assoc item result) + (setq result (cons (cons item entry) + result)))))))) (error nil)))) (message "Processing Info node `%s'...done" node) (setq doc-spec (cdr doc-spec))) @@ -712,14 +717,6 @@ "`" "\\({[^}]*}\\)?'"))) (info-lookup-maybe-add-help - :mode 'scheme-mode - :regexp ;; "\\(\\sw\\|\\s_\\)+" - "[^()' \t\n]+" - :ignore-case t - ;; Aubrey Jaffer's rendition from <URL:ftp://ftp-swiss.ai.mit.edu/pub/scm> - :doc-spec '(("(r5rs)Index"))) - -(info-lookup-maybe-add-help :mode 'emacs-lisp-mode :regexp "[^()' \t\n]+" :doc-spec '(("(emacs)Command Index") @@ -749,6 +746,7 @@ :mode 'scheme-mode :regexp "[^()' \t\n]+" :ignore-case t + ;; Aubrey Jaffer's rendition from <URL:ftp://ftp-swiss.ai.mit.edu/pub/scm> :doc-spec '(("(r5rs)Index" nil "^[ \t]+- [^:]+:[ \t]*" "\\b")))