Fix tramp bug with empty explicit path

3 files changed, 15 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 91eea5301bf..3182666b483 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+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):
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 737172e359f..95e45260f85 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -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)))
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."
       (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)))