mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-27 10:54:40 +00:00
(PC-do-completion): If complete but not unique,
the second time in a row, give a list of completions. (PC-do-complete-and-exit, PC-do-completion): Use [...] in messages.
This commit is contained in:
parent
6069d957df
commit
80f14e531f
@ -228,7 +228,7 @@ See `PC-complete' for details."
|
||||
(if (or (eq flag 'complete)
|
||||
(not minibuffer-completion-confirm))
|
||||
(exit-minibuffer)
|
||||
(PC-temp-minibuffer-message " (Confirm)"))))))
|
||||
(PC-temp-minibuffer-message " [Confirm]"))))))
|
||||
|
||||
|
||||
(defun PC-completion-help ()
|
||||
@ -400,10 +400,10 @@ See `PC-complete' for details."
|
||||
(PC-do-completion 'word))
|
||||
(beep)
|
||||
(PC-temp-minibuffer-message (if ambig
|
||||
" (Ambiguous dir name)"
|
||||
" [Ambiguous dir name]"
|
||||
(if (eq mode 'help)
|
||||
" (No completions)"
|
||||
" (No match)")))
|
||||
" [No completions]"
|
||||
" [No match]")))
|
||||
nil))
|
||||
|
||||
;; More than one valid completion found
|
||||
@ -441,12 +441,12 @@ See `PC-complete' for details."
|
||||
(while (and p
|
||||
(not (equal (car p) basestr)))
|
||||
(setq p (cdr p)))
|
||||
(if p
|
||||
|
||||
(progn
|
||||
(if (null mode)
|
||||
(PC-temp-minibuffer-message " (Complete, but not unique)"))
|
||||
t)
|
||||
(and p (null mode)
|
||||
(PC-temp-minibuffer-message " [Complete, but not unique]"))
|
||||
(if (and p
|
||||
(not (and (null mode)
|
||||
(eq this-command last-command))))
|
||||
t
|
||||
|
||||
;; If ambiguous, try for a partial completion
|
||||
(let ((improved nil)
|
||||
@ -539,14 +539,14 @@ See `PC-complete' for details."
|
||||
;; so that choosing a completion from the list
|
||||
;; knows how much old text to replace.
|
||||
(setq completion-base-size dirlength)))
|
||||
(PC-temp-minibuffer-message " (Next char not unique)"))
|
||||
(PC-temp-minibuffer-message " [Next char not unique]"))
|
||||
nil)))))
|
||||
|
||||
;; Only one possible completion
|
||||
(t
|
||||
(if (equal basestr (car poss))
|
||||
(if (null mode)
|
||||
(PC-temp-minibuffer-message " (Sole completion)"))
|
||||
(PC-temp-minibuffer-message " [Sole completion]"))
|
||||
(delete-region beg end)
|
||||
(insert (format "%s"
|
||||
(if filename
|
||||
|
Loading…
Reference in New Issue
Block a user