[Emacs-diffs] emacs/lisp complete.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/11/28 19:11:58

Modified files:
        lisp           : complete.el 

Log message:
        (PC-do-complete-and-exit): Synch to 2008-11-24 change to
        minibuffer.el; recognize `confirm' and `confirm-after-completion'
        values for minibuffer-completion-confirm.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/complete.el?cvsroot=emacs&r1=1.89&r2=1.90

Patches:
Index: complete.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/complete.el,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- complete.el 7 Sep 2008 20:56:27 -0000       1.89
+++ complete.el 28 Nov 2008 19:11:58 -0000      1.90
@@ -330,13 +330,22 @@
    ((= (point-max) (minibuffer-prompt-end))
     ;; Duplicate the "bug" that Info-menu relies on...
     (exit-minibuffer))
-   ((eq minibuffer-completion-confirm 'confirm-only)
+   ((eq minibuffer-completion-confirm 'confirm)
     (if (or (eq last-command this-command)
             (test-completion (field-string)
                              minibuffer-completion-table
                              minibuffer-completion-predicate))
         (exit-minibuffer)
       (PC-temp-minibuffer-message " [Confirm]")))
+   ((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 (and (memq last-command '(PC-complete minibuffer-complete))
+            (not (test-completion (field-string)
+                                  minibuffer-completion-table
+                                  minibuffer-completion-predicate)))
+       (PC-temp-minibuffer-message " [Confirm]")
+      (exit-minibuffer)))
    (t
     (let ((flag (PC-do-completion 'exit)))
       (and flag