diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-08-18 19:11:41 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-08-18 19:11:41 +0000 |
| commit | 265d4549b092b93c37c495a9202b7367f7a156d9 (patch) | |
| tree | 3e8ad4b885acdb11815e6380a6720c6cac410357 /lisp | |
| parent | ffc90b851ec7c2c6791ac66ff266f69bda08593c (diff) | |
| download | emacs-265d4549b092b93c37c495a9202b7367f7a156d9.tar.gz | |
(completion--do-completion): Move point for the #b001 case as well (bug#4176).
(minibuffer-complete, minibuffer-complete-word): Don't move point.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/minibuffer.el | 19 |
2 files changed, 17 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 69d02d2a68c..c3ca51be780 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 13c850d3eaa..dc43b361566 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -308,7 +308,8 @@ TRY-COMPLETION is the function that does the completion, and 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 @@ E = after completion we now have an Exact match. (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 @@ scroll the window of possible completions." (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 @@ Return nil if there is no valid completion, else t." (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))) |