emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r110667: * lisp/minibuffer.el (minibu


From: Stefan Monnier
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r110667: * lisp/minibuffer.el (minibuffer-force-complete): Fix thinko.
Date: Thu, 25 Oct 2012 08:56:13 -0400
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 110667
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-10-25 08:56:13 -0400
message:
  * lisp/minibuffer.el (minibuffer-force-complete): Fix thinko.
modified:
  lisp/ChangeLog
  lisp/minibuffer.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-25 12:41:23 +0000
+++ b/lisp/ChangeLog    2012-10-25 12:56:13 +0000
@@ -1,5 +1,7 @@
 2012-10-25  Stefan Monnier  <address@hidden>
 
+       * 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).
 

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2012-10-24 19:40:23 +0000
+++ b/lisp/minibuffer.el        2012-10-25 12:56:13 +0000
@@ -1124,10 +1124,10 @@
         (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)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]