Commit 9bdba5f5 authored by Stefan Monnier's avatar Stefan Monnier

* lisp/minibuffer.el (minibuffer-completion-help): Specify the end of the

completion field.

Fixes: debbugs:7211
parent 73525e72
2010-11-08 Stefan Monnier <monnier@iro.umontreal.ca>
* minibuffer.el (minibuffer-completion-help): Specify the end of the
completion field (bug#7211).
* progmodes/python.el (python-font-lock-syntactic-keywords): (bug#7322)
Fix handling of backslash escapes.
(python-quote-syntax): Adjust accordingly.
......
......@@ -41,7 +41,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
......@@ -1075,6 +1075,7 @@ variables.")
(interactive)
(message "Making completion list...")
(lexical-let* ((start (field-beginning))
(end (field-end))
(string (field-string))
(completions (completion-all-completions
string
......@@ -1106,10 +1107,12 @@ variables.")
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment