diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-12-15 02:00:11 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-12-15 02:00:11 +0000 |
| commit | 39bd6b67d66b7596b2e524dacae0e1b1025c4776 (patch) | |
| tree | 95136a42d9449b50f0b317b8b7bc3a9e6a2dec19 /lisp/complete.el | |
| parent | fba5eace8374aacae866650208d0015984b0b12f (diff) | |
| download | emacs-39bd6b67d66b7596b2e524dacae0e1b1025c4776.tar.gz | |
(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.
Diffstat (limited to 'lisp/complete.el')
| -rw-r--r-- | lisp/complete.el | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/complete.el b/lisp/complete.el index fea94618632..fa559e91395 100644 --- a/lisp/complete.el +++ b/lisp/complete.el @@ -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 |