Mercurial > emacs
changeset 104342:867af630a71e
(completion--do-completion): Move point for the #b001 case as well (bug#4176).
(minibuffer-complete, minibuffer-complete-word): Don't move point.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 18 Aug 2009 19:11:41 +0000 |
| parents | f25cba6d7938 |
| children | 396aecca2f45 |
| files | lisp/ChangeLog lisp/minibuffer.el |
| diffstat | 2 files changed, 17 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Aug 18 16:23:09 2009 +0000 +++ b/lisp/ChangeLog Tue Aug 18 19:11:41 2009 +0000 @@ -1,3 +1,9 @@ +2009-08-18 Stefan Monnier <monnier@iro.umontreal.ca> + + * minibuffer.el (completion--do-completion): Move point for the #b001 + case as well (bug#4176). + (minibuffer-complete, minibuffer-complete-word): Don't move point. + 2009-08-18 Michael Albinus <michael.albinus@gmx.de> * net/dbus.el (dbus-init-bus): Declare. Apply it for the :system @@ -5,8 +11,8 @@ 2009-08-18 Kenichi Handa <handa@m17n.org> - * international/ucs-normalize.el (ucs-normalize-version): Changed - to 1.1. + * international/ucs-normalize.el (ucs-normalize-version): + Change to 1.1. (ucs-normalize-hfs-nfd-pre-write-conversion): New function. (utf-8-hfs): Make it perform normalization on encoding too.
--- a/lisp/minibuffer.el Tue Aug 18 16:23:09 2009 +0000 +++ b/lisp/minibuffer.el Tue Aug 18 19:11:41 2009 +0000 @@ -308,7 +308,8 @@ ALL-COMPLETIONS is the function that lists the completions.") (defcustom completion-styles '(basic partial-completion emacs22) - "List of completion styles to use." + "List of completion styles to use. +The available styles are listed in `completion-styles-alist'." :type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x))) completion-styles-alist))) :group 'minibuffer @@ -388,7 +389,9 @@ (cond ((null comp) (ding) (minibuffer-message "No match") (minibuffer--bitset nil nil nil)) - ((eq t comp) (minibuffer--bitset nil nil t)) ;Exact and unique match. + ((eq t comp) + (goto-char (field-end)) + (minibuffer--bitset nil nil t)) ;Exact and unique match. (t ;; `completed' should be t if some completion was done, which doesn't ;; include simply changing the case of the entered string. However, @@ -462,11 +465,9 @@ (case (completion--do-completion) (#b000 nil) - (#b001 (goto-char (field-end)) - (minibuffer-message "Sole completion") + (#b001 (minibuffer-message "Sole completion") t) - (#b011 (goto-char (field-end)) - (minibuffer-message "Complete, but not unique") + (#b011 (minibuffer-message "Complete, but not unique") t) (t t))))) @@ -694,11 +695,9 @@ (interactive) (case (completion--do-completion 'completion--try-word-completion) (#b000 nil) - (#b001 (goto-char (field-end)) - (minibuffer-message "Sole completion") + (#b001 (minibuffer-message "Sole completion") t) - (#b011 (goto-char (field-end)) - (minibuffer-message "Complete, but not unique") + (#b011 (minibuffer-message "Complete, but not unique") t) (t t)))