aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorDaniel Colascione2014-02-26 21:11:50 -0800
committerDaniel Colascione2014-02-26 21:11:50 -0800
commiteff3168abcbdf6dde12e2358e6bf02caa55c8bf3 (patch)
tree373f6f08848ef21f3e2fd22d7f5ed8fce1e8ce0a /lisp/net
parent675cab2c1b7343a952c87ebcbed08e07d6a55d52 (diff)
downloademacs-eff3168abcbdf6dde12e2358e6bf02caa55c8bf3.tar.gz
emacs-eff3168abcbdf6dde12e2358e6bf02caa55c8bf3.zip
Fix tramp bug with empty explicit path
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/tramp-sh.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 37e212970ce..04109f9816c 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4846,7 +4846,7 @@ Return ATTR."
4846 (when elt1 4846 (when elt1
4847 (setcdr elt1 4847 (setcdr elt1
4848 (append 4848 (append
4849 (tramp-compat-split-string default-remote-path ":") 4849 (tramp-compat-split-string (or default-remote-path "") ":")
4850 (cdr elt1))) 4850 (cdr elt1)))
4851 (setq remote-path (delq 'tramp-default-remote-path remote-path))) 4851 (setq remote-path (delq 'tramp-default-remote-path remote-path)))
4852 4852
@@ -4854,7 +4854,7 @@ Return ATTR."
4854 (when elt2 4854 (when elt2
4855 (setcdr elt2 4855 (setcdr elt2
4856 (append 4856 (append
4857 (tramp-compat-split-string own-remote-path ":") 4857 (tramp-compat-split-string (or own-remote-path "") ":")
4858 (cdr elt2))) 4858 (cdr elt2)))
4859 (setq remote-path (delq 'tramp-own-remote-path remote-path))) 4859 (setq remote-path (delq 'tramp-own-remote-path remote-path)))
4860 4860