Commit d1826585 authored by Miles Bader's avatar Miles Bader
Browse files

Add and use minibuffer-confirm-exit-commands variable

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1483
parent 98d05998
2008-11-29 Miles Bader <miles@gnu.org>
* minibuffer.el (minibuffer-confirm-exit-commands): New variable.
(minibuffer-complete-and-exit): Use it.
2008-11-29 Chong Yidong <cyd@stupidchicken.com>
 
* term/x-win.el (x-gtk-stock-cache): New hash table.
......
......@@ -542,6 +542,11 @@ Repeated uses step through the possible completions."
;; through the previous possible completions.
(setq completion-all-sorted-completions (cdr all)))))
(defvar minibuffer-confirm-exit-commands
'(minibuffer-complete minibuffer-complete-word)
"A list of commands which cause an immediately following
`minibuffer-complete-and-exit' to ask for extra confirmation.")
(defun minibuffer-complete-and-exit ()
"Exit if the minibuffer contains a valid completion.
Otherwise, try to complete the minibuffer contents. If
......@@ -595,7 +600,7 @@ If `minibuffer-completion-confirm' is `confirm-after-completion',
((eq minibuffer-completion-confirm 'confirm-after-completion)
;; Similar to the above, but only if trying to exit immediately
;; after typing TAB (this catches most minibuffer typos).
(if (eq last-command 'minibuffer-complete)
(if (memq last-command minibuffer-confirm-exit-commands)
(progn (minibuffer-message "Confirm")
nil)
(exit-minibuffer)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment