Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
34cba8e8
Commit
34cba8e8
authored
May 14, 2014
by
Stephen Berman
Committed by
Stefan Monnier
May 14, 2014
Browse files
* lisp/minibuffer.el (completion-pcm--merge-try): Merge trailing / with
suffix. Fixes: debbugs:15419
parent
a5d09243
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
2 deletions
+17
-2
lisp/ChangeLog
lisp/ChangeLog
+6
-0
lisp/minibuffer.el
lisp/minibuffer.el
+11
-2
No files found.
lisp/ChangeLog
View file @
34cba8e8
2014-05-14 Stephen Berman <stephen.berman@gmx.net>
Stefan Monnier <monnier@iro.umontreal.ca>
* minibuffer.el (completion-pcm--merge-try): Merge trailing / with
suffix (bug#15419).
2014-05-14 Glenn Morris <rgm@gnu.org>
* vc/emerge.el (emerge-temp-file-prefix):
...
...
lisp/minibuffer.el
View file @
34cba8e8
...
...
@@ -3215,11 +3215,20 @@ the same set of elements."
;; Not `prefix'.
mergedpat
))
;; New pos from the start.
(
newpos
(
length
(
completion-pcm--pattern->string
pointpat
)))
(
newpos
(
length
(
completion-pcm--pattern->string
pointpat
)))
;; Do it afterwards because it changes `pointpat' by side effect.
(
merged
(
completion-pcm--pattern->string
(
nreverse
mergedpat
))))
(
setq
suffix
(
completion--merge-suffix
merged
newpos
suffix
))
(
setq
suffix
(
completion--merge-suffix
;; The second arg should ideally be "the position right
;; after the last char of `merged' that comes from the text
;; to be completed". But completion-pcm--merge-completions
;; currently doesn't give us that info. So instead we just
;; use the "last but one" position, which tends to work
;; well in practice since `suffix' always starts
;; with a boundary and we hence mostly/only care about
;; merging this boundary (bug#15419).
merged
(
max
0
(
1-
(
length
merged
)))
suffix
))
(
cons
(
concat
prefix
merged
suffix
)
(
+
newpos
(
length
prefix
)))))))
(
defun
completion-pcm-try-completion
(
string
table
pred
point
)
...
...
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