Mercurial > emacs
diff lisp/minibuffer.el @ 111449:132f2dfd549f
Merge from emacs-23
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 09 Nov 2010 15:07:10 -0500 |
parents | 4c0e52d5ae12 93e249d6d27c |
children | 4ed7d6375e3b |
line wrap: on
line diff
--- a/lisp/minibuffer.el Tue Nov 09 10:29:37 2010 +0000 +++ b/lisp/minibuffer.el Tue Nov 09 15:07:10 2010 -0500 @@ -42,7 +42,7 @@ ;; provide the start info but not the end info in ;; completion-base-position. ;; - quoting is problematic. E.g. the double-dollar quoting used in -;; substitie-in-file-name (and hence read-file-name-internal) bumps +;; substitute-in-file-name (and hence read-file-name-internal) bumps ;; into various bugs: ;; - choose-completion doesn't know how to quote the text it inserts. ;; E.g. it fails to double the dollars in file-name completion, or @@ -1133,6 +1133,7 @@ (interactive) (message "Making completion list...") (lexical-let* ((start (field-beginning)) + (end (field-end)) (string (field-string)) (completions (completion-all-completions string @@ -1164,10 +1165,12 @@ completions))) (with-current-buffer standard-output (set (make-local-variable 'completion-base-position) - ;; FIXME: We should provide the END part as well, but - ;; currently completion-all-completions does not give - ;; us the necessary information. - (list (+ start base-size) nil))) + (list (+ start base-size) + ;; FIXME: We should pay attention to completion + ;; boundaries here, but currently + ;; completion-all-completions does not give us the + ;; necessary information. + end))) (display-completion-list completions))) ;; If there are no completions, or if the current input is already the