mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-21 04:17:35 +00:00
(Info-read-node-name-1, Info-read-node-name):
Rename completion-table to Info-read-node-completion-table. (Info-read-node-completion-table): Add defvar.
This commit is contained in:
parent
86f281250c
commit
ddf8921158
1 changed files with 7 additions and 5 deletions
12
lisp/info.el
12
lisp/info.el
|
|
@ -773,27 +773,29 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
|
|||
(Info-find-node (if (equal filename "") nil filename)
|
||||
(if (equal nodename "") "Top" nodename))))
|
||||
|
||||
(defvar Info-read-node-completion-table)
|
||||
|
||||
;; This function is used as the "completion table" while reading a node name.
|
||||
;; It does completion using the alist in completion-table
|
||||
;; It does completion using the alist in Info-read-node-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)))
|
||||
(try-completion string Info-read-node-completion-table predicate)))
|
||||
((eq code t)
|
||||
(if no-completion
|
||||
nil
|
||||
(all-completions string completion-table predicate)))
|
||||
(all-completions string Info-read-node-completion-table predicate)))
|
||||
((eq code 'lambda)
|
||||
(if no-completion
|
||||
t
|
||||
(assoc string completion-table))))))
|
||||
(assoc string Info-read-node-completion-table))))))
|
||||
|
||||
(defun Info-read-node-name (prompt &optional default)
|
||||
(let* ((completion-ignore-case t)
|
||||
(completion-table (Info-build-node-completions))
|
||||
(Info-read-node-completion-table (Info-build-node-completions))
|
||||
(nodename (completing-read prompt 'Info-read-node-name-1 nil t)))
|
||||
(if (equal nodename "")
|
||||
(or default
|
||||
|
|
|
|||
Loading…
Reference in a new issue