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
51f213c3
Commit
51f213c3
authored
Feb 26, 2014
by
Daniel Colascione
Browse files
Fix tramp bug with empty explicit path
parents
b77cfcd7
eff3168a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
8 deletions
+15
-8
lisp/ChangeLog
lisp/ChangeLog
+7
-0
lisp/minibuffer.el
lisp/minibuffer.el
+6
-6
lisp/net/tramp-sh.el
lisp/net/tramp-sh.el
+2
-2
No files found.
lisp/ChangeLog
View file @
51f213c3
2014-02-27 Daniel Colascione <dancol@dancol.org>
* minibuffer.el (completion--nth-completion): Fix indentation.
* net/tramp-sh.el (tramp-get-remote-path): Don't signal error when
explicit tramp path is empty.
2014-02-27 Glenn Morris <rgm@gnu.org>
* emacs-lisp/crm.el (completing-read-multiple):
...
...
lisp/minibuffer.el
View file @
51f213c3
...
...
@@ -850,12 +850,12 @@ completing buffer and file names, respectively."
(
setq
table
(
pop
new
))
(
setq
point
(
pop
new
))
(
pop
new
))))
(
result
(
completion--some
(
lambda
(
style
)
(
funcall
(
nth
n
(
assq
style
completion-styles-alist
))
string
table
pred
point
))
(
completion--styles
metadata
))))
(
result
(
completion--some
(
lambda
(
style
)
(
funcall
(
nth
n
(
assq
style
completion-styles-alist
))
string
table
pred
point
))
(
completion--styles
metadata
))))
(
if
requote
(
funcall
requote
result
n
)
result
)))
...
...
lisp/net/tramp-sh.el
View file @
51f213c3
...
...
@@ -4846,7 +4846,7 @@ Return ATTR."
(when elt1
(setcdr elt1
(append
(tramp-compat-split-string default-remote-path ":")
(tramp-compat-split-string
(or
default-remote-path
"")
":")
(cdr elt1)))
(setq remote-path (delq 'tramp-default-remote-path remote-path)))
...
...
@@ -4854,7 +4854,7 @@ Return ATTR."
(when elt2
(setcdr elt2
(append
(tramp-compat-split-string own-remote-path ":")
(tramp-compat-split-string
(or
own-remote-path
"")
":")
(cdr elt2)))
(setq remote-path (delq 'tramp-own-remote-path remote-path)))
...
...
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