* minibuffer.el (minibuffer-confirm-exit-commands): Add completion-at-point.

Fixes: debbugs:11725

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9fb4963233e5537566e6dce9de645f072396f04..03730a68cca18b6b1c646ce5f2aae63247d1b049 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * minibuffer.el (minibuffer-confirm-exit-commands):
+       Add completion-at-point (bug#11725).
+
 2012-06-21  Glenn Morris  <rgm@gnu.org>
 
        * progmodes/f90.el (f90-font-lock-keywords-2):
@@ -43,8 +48,8 @@
 
 2012-05-18  Eli Zaretskii  <eliz@gnu.org>
 
-       * mail/sendmail.el (mail-yank-region): Recognize
-       rmail-yank-current-message in addition to insert-buffer.
+       * mail/sendmail.el (mail-yank-region):
+       Recognize rmail-yank-current-message in addition to insert-buffer.
        Fixes mail-mode's "C-c C-r" that otherwise does nothing when invoked in
        a *mail* buffer created through rmail-start-mail with sendmail as
        mail-user-agent.

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index db7743970d4bf5c895567312b33c878d3d2a4cec..c4f09664e1bec1ab6121f2a461cff0608bbf50d8 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -892,7 +892,8 @@ Repeated uses step through the possible completions."
         (completion--cache-all-sorted-completions (cdr all)))))))
 
 (defvar minibuffer-confirm-exit-commands
-  '(minibuffer-complete minibuffer-complete-word PC-complete PC-complete-word)
+  '(completion-at-point minibuffer-complete
+    minibuffer-complete-word PC-complete PC-complete-word)
   "A list of commands which cause an immediately following
 `minibuffer-complete-and-exit' to ask for extra confirmation.")