* lisp/minibuffer.el (minibuffer-force-complete): Fix thinko.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c78ea4038e6e41a9b4626bf9fa072586b985d07..71b3e3029b324d8817318f75b85c4a8e5474a232 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-10-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * minibuffer.el (minibuffer-force-complete): Fix thinko.
+
        * net/ldap.el (ldap-search-internal): The official ldif format starts
        with a "version: 1" header (bug#12724).
 

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 4267fe4db4f8bef280abcf1dc5f5ad61cced42ff..4421e325b915116600c69b23b32e73da95ef3a17 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1124,10 +1124,10 @@ Repeated uses step through the possible completions."
         (completion--message
        (if all "No more completions" "No completions")))
      ((not (consp (cdr all)))
-      (let ((mod (equal (car all) (buffer-substring-no-properties base end))))
-        (if mod (completion--replace base end (car all)))
+      (let ((done (equal (car all) (buffer-substring-no-properties base end))))
+        (unless done (completion--replace base end (car all)))
         (completion--done (buffer-substring-no-properties start (point))
-                          'finished (unless mod "Sole completion"))))
+                          'finished (when done "Sole completion"))))
      (t
       (completion--replace base end (car all))
       (completion--done (buffer-substring-no-properties start (point)) 'sole)