# HG changeset patch # User Richard M. Stallman # Date 787456811 0 # Node ID d16e46a4e34c0d5b974f7a5468a6c77e4b1a9f0c # Parent 70b04b2182163b9df76bb64a873fdd7545a8ebe5 (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. diff -r 70b04b218216 -r d16e46a4e34c lisp/complete.el --- a/lisp/complete.el Thu Dec 15 01:57:36 1994 +0000 +++ b/lisp/complete.el Thu Dec 15 02:00:11 1994 +0000 @@ -228,7 +228,7 @@ (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 @@ (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 @@ (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 @@ ;; 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