Commit 51f213c3 authored by Daniel Colascione's avatar Daniel Colascione
Browse files

Fix tramp bug with empty explicit path

parents b77cfcd7 eff3168a
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> 2014-02-27 Glenn Morris <rgm@gnu.org>
* emacs-lisp/crm.el (completing-read-multiple): * emacs-lisp/crm.el (completing-read-multiple):
......
...@@ -850,12 +850,12 @@ completing buffer and file names, respectively." ...@@ -850,12 +850,12 @@ completing buffer and file names, respectively."
(setq table (pop new)) (setq table (pop new))
(setq point (pop new)) (setq point (pop new))
(pop new)))) (pop new))))
(result (result
(completion--some (lambda (style) (completion--some (lambda (style)
(funcall (nth n (assq style (funcall (nth n (assq style
completion-styles-alist)) completion-styles-alist))
string table pred point)) string table pred point))
(completion--styles metadata)))) (completion--styles metadata))))
(if requote (if requote
(funcall requote result n) (funcall requote result n)
result))) result)))
......
...@@ -4846,7 +4846,7 @@ Return ATTR." ...@@ -4846,7 +4846,7 @@ Return ATTR."
(when elt1 (when elt1
(setcdr elt1 (setcdr elt1
(append (append
(tramp-compat-split-string default-remote-path ":") (tramp-compat-split-string (or default-remote-path "") ":")
(cdr elt1))) (cdr elt1)))
(setq remote-path (delq 'tramp-default-remote-path remote-path))) (setq remote-path (delq 'tramp-default-remote-path remote-path)))
...@@ -4854,7 +4854,7 @@ Return ATTR." ...@@ -4854,7 +4854,7 @@ Return ATTR."
(when elt2 (when elt2
(setcdr elt2 (setcdr elt2
(append (append
(tramp-compat-split-string own-remote-path ":") (tramp-compat-split-string (or own-remote-path "") ":")
(cdr elt2))) (cdr elt2)))
(setq remote-path (delq 'tramp-own-remote-path remote-path))) (setq remote-path (delq 'tramp-own-remote-path remote-path)))
......
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