Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
9bdba5f5
Commit
9bdba5f5
authored
Nov 08, 2010
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* lisp/minibuffer.el (minibuffer-completion-help): Specify the end of the
completion field. Fixes: debbugs:7211
parent
73525e72
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
lisp/ChangeLog
lisp/ChangeLog
+3
-0
lisp/minibuffer.el
lisp/minibuffer.el
+8
-5
No files found.
lisp/ChangeLog
View file @
9bdba5f5
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.
...
...
lisp/minibuffer.el
View file @
9bdba5f5
...
...
@@ -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
;; substit
i
e-in-file-name (and hence read-file-name-internal) bumps
;; substit
ut
e-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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment