diff options
| author | Dave Love <fx@gnu.org> | 1998-10-02 14:35:09 +0000 |
|---|---|---|
| committer | Dave Love <fx@gnu.org> | 1998-10-02 14:35:09 +0000 |
| commit | 6480a693a2d702d821c40709965ea975d1ffef7d (patch) | |
| tree | aece42470ad98512967ddb8dbe73d805b4acec49 /lisp/info-look.el | |
| parent | c06fc524637a6e48d8d71dc4150674963bfb4183 (diff) | |
| download | emacs-6480a693a2d702d821c40709965ea975d1ffef7d.tar.gz | |
Remove duplicate scheme-mode entry.
(info-lookup-make-completions): When looking for entries, check
that `item' isn't null or "Menu".
Diffstat (limited to 'lisp/info-look.el')
| -rw-r--r-- | lisp/info-look.el | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/lisp/info-look.el b/lisp/info-look.el index d1d5661fb8a..44017042776 100644 --- a/lisp/info-look.el +++ b/lisp/info-look.el @@ -454,12 +454,17 @@ The default file name is the one found at point." (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 @@ Return nil if there is nothing appropriate." "`" "\\({[^}]*}\\)?'"))) (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 @@ Return nil if there is nothing appropriate." :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"))) |