diff options
| author | Stefan Monnier | 2012-10-25 08:56:13 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-10-25 08:56:13 -0400 |
| commit | 414a8595f0b5b95bd89547a59b57a6effb757491 (patch) | |
| tree | 731fcc12661d39c5177e2f38e860d927534e21f4 | |
| parent | fb5b947504a34cd19aee4cddf308927cc1a90100 (diff) | |
| download | emacs-414a8595f0b5b95bd89547a59b57a6effb757491.tar.gz emacs-414a8595f0b5b95bd89547a59b57a6effb757491.zip | |
* lisp/minibuffer.el (minibuffer-force-complete): Fix thinko.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2012-10-25 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2012-10-25 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * minibuffer.el (minibuffer-force-complete): Fix thinko. | ||
| 4 | |||
| 3 | * net/ldap.el (ldap-search-internal): The official ldif format starts | 5 | * net/ldap.el (ldap-search-internal): The official ldif format starts |
| 4 | with a "version: 1" header (bug#12724). | 6 | with a "version: 1" header (bug#12724). |
| 5 | 7 | ||
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." | |||
| 1124 | (completion--message | 1124 | (completion--message |
| 1125 | (if all "No more completions" "No completions"))) | 1125 | (if all "No more completions" "No completions"))) |
| 1126 | ((not (consp (cdr all))) | 1126 | ((not (consp (cdr all))) |
| 1127 | (let ((mod (equal (car all) (buffer-substring-no-properties base end)))) | 1127 | (let ((done (equal (car all) (buffer-substring-no-properties base end)))) |
| 1128 | (if mod (completion--replace base end (car all))) | 1128 | (unless done (completion--replace base end (car all))) |
| 1129 | (completion--done (buffer-substring-no-properties start (point)) | 1129 | (completion--done (buffer-substring-no-properties start (point)) |
| 1130 | 'finished (unless mod "Sole completion")))) | 1130 | 'finished (when done "Sole completion")))) |
| 1131 | (t | 1131 | (t |
| 1132 | (completion--replace base end (car all)) | 1132 | (completion--replace base end (car all)) |
| 1133 | (completion--done (buffer-substring-no-properties start (point)) 'sole) | 1133 | (completion--done (buffer-substring-no-properties start (point)) 'sole) |