diff options
author | Richard M. Stallman <rms@gnu.org> | 1995-08-05 20:56:23 +0000 |
---|---|---|
committer | Richard M. Stallman <rms@gnu.org> | 1995-08-05 20:56:23 +0000 |
commit | 03524be63ae2a8d72fce0652208a57f1fc788edb (patch) | |
tree | 087b6d4d42e4d02343c5e62d5fa0fb4ac5ce24cd /lisp/info.el | |
parent | a2964053573a757212e5a884475ee654a886bc15 (diff) | |
download | emacs-03524be63ae2a8d72fce0652208a57f1fc788edb.tar.gz |
(Info-read-node-name-1): New function.
(Info-read-node-name): Use Info-read-node-name-1
to avoid getting confused by spaces when text starts with (FILENAME).
Diffstat (limited to 'lisp/info.el')
-rw-r--r-- | lisp/info.el | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/lisp/info.el b/lisp/info.el index fd08a00e25e..6c079f9fc99 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -605,9 +605,28 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself." (Info-find-node (if (equal filename "") nil filename) (if (equal nodename "") "Top" nodename)))) +;; This function is used as the "completion table" while reading a node name. +;; It does completion using the alist in completion-table +;; unless STRING starts with an open-paren. +(defun Info-read-node-name-1 (string predicate code) + (let ((no-completion (and (> (length string) 0) (eq (aref string 0) ?\()))) + (cond ((eq code nil) + (if no-completion + string + (try-completion string completion-table predicate))) + ((eq code t) + (if no-completion + nil + (all-completions string completion-table predicate))) + ((eq code 'lambda) + (if no-completion + t + (assoc string completion-table)))))) + (defun Info-read-node-name (prompt &optional default) (let* ((completion-ignore-case t) - (nodename (completing-read prompt (Info-build-node-completions)))) + (completion-table (Info-build-node-completions)) + (nodename (completing-read prompt 'Info-read-node-name-1))) (if (equal nodename "") (or default (Info-read-node-name prompt)) |