From: Stefan Monnier Date: Thu, 25 Oct 2012 12:56:13 +0000 (-0400) Subject: * lisp/minibuffer.el (minibuffer-force-complete): Fix thinko. X-Git-Tag: emacs-24.2.90~209^2~73 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=414a8595f0b5b95bd89547a59b57a6effb757491;p=emacs.git * lisp/minibuffer.el (minibuffer-force-complete): Fix thinko. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0c78ea4038e..71b3e3029b3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2012-10-25 Stefan Monnier + * 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 4267fe4db4f..4421e325b91 100644 --- 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)