emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r116571: Fix tramp bug with empty explicit path


From: Daniel Colascione
Subject: [Emacs-diffs] trunk r116571: Fix tramp bug with empty explicit path
Date: Thu, 27 Feb 2014 05:20:42 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 116571 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Daniel Colascione <address@hidden>
branch nick: trunk
timestamp: Wed 2014-02-26 21:20:20 -0800
message:
  Fix tramp bug with empty explicit path
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/minibuffer.el             
minibuffer.el-20091113204419-o5vbwnq5f7feedwu-8622
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-27 04:17:40 +0000
+++ b/lisp/ChangeLog    2014-02-27 05:20:20 +0000
@@ -1,3 +1,10 @@
+2014-02-27  Daniel Colascione  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/crm.el (completing-read-multiple):

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2014-02-24 15:41:46 +0000
+++ b/lisp/minibuffer.el        2014-02-26 21:31:22 +0000
@@ -850,12 +850,12 @@
              (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)))

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2014-02-24 15:48:32 +0000
+++ b/lisp/net/tramp-sh.el      2014-02-27 05:11:50 +0000
@@ -4846,7 +4846,7 @@
       (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 @@
       (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)))
 


reply via email to

[Prev in Thread] Current Thread [Next in Thread]