diff options
| author | Stefan Monnier | 2008-11-29 02:39:19 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-11-29 02:39:19 +0000 |
| commit | a231a45f50993d3b599db10fe626971ff4495153 (patch) | |
| tree | e2034f2e2f67378b57dd9290eec84866eb86fcdb | |
| parent | e93bc1426f19ea573de477d6170271d36ced45da (diff) | |
| download | emacs-a231a45f50993d3b599db10fe626971ff4495153.tar.gz emacs-a231a45f50993d3b599db10fe626971ff4495153.zip | |
(completion--try-word-completion): Don't ignore
partial-completion if it's the only style.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/minibuffer.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7d8991d6e0f..9628a63feb6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-11-29 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * minibuffer.el (completion--try-word-completion): Don't ignore | ||
| 4 | partial-completion if it's the only style. | ||
| 5 | |||
| 1 | 2008-11-28 Juanma Barranquero <lekktu@gmail.com> | 6 | 2008-11-28 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * emacs-lisp/re-builder.el (reb-auto-update): Remove redundant code. | 8 | * emacs-lisp/re-builder.el (reb-auto-update): Remove redundant code. |
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index d16d0362a36..84d8e658a72 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el | |||
| @@ -625,7 +625,8 @@ If `minibuffer-completion-confirm' is `confirm-after-completion', | |||
| 625 | (after (substring string point)) | 625 | (after (substring string point)) |
| 626 | ;; Disable partial-completion for this. | 626 | ;; Disable partial-completion for this. |
| 627 | (completion-styles | 627 | (completion-styles |
| 628 | (remove 'partial-completion completion-styles)) | 628 | (or (remove 'partial-completion completion-styles) |
| 629 | completion-styles)) | ||
| 629 | tem) | 630 | tem) |
| 630 | (while (and exts (not (consp tem))) | 631 | (while (and exts (not (consp tem))) |
| 631 | (setq tem (completion-try-completion | 632 | (setq tem (completion-try-completion |