From 414a8595f0b5b95bd89547a59b57a6effb757491 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 25 Oct 2012 08:56:13 -0400 Subject: [PATCH] * lisp/minibuffer.el (minibuffer-force-complete): Fix thinko. --- lisp/ChangeLog | 2 ++ lisp/minibuffer.el | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) 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) -- 2.39.2