aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2014-04-20 23:35:55 +0200
committerMichael Albinus2014-04-20 23:35:55 +0200
commitfeb5d8a4d340ef247ec581141388f6ba6cfb0d73 (patch)
tree81d85a4e2ccc81cf31406e2b0f87e1196253ec0f
parent0c48323816982162e01c71d3ae9ceed16a3f917d (diff)
downloademacs-feb5d8a4d340ef247ec581141388f6ba6cfb0d73.tar.gz
emacs-feb5d8a4d340ef247ec581141388f6ba6cfb0d73.zip
* net/tramp-sh.el (tramp-get-ls-command): Use "-b" argument if possible.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp-sh.el6
2 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d762078dfd0..0b7de93cc02 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-04-20 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-sh.el (tramp-get-ls-command): Use "-b" argument if
4 possible.
5
12014-04-19 Stefan Monnier <monnier@iro.umontreal.ca> 62014-04-19 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * progmodes/sh-script.el (sh-smie--sh-keyword-p): Handle variable 8 * progmodes/sh-script.el (sh-smie--sh-keyword-p): Handle variable
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 3b600e3d84e..0dd5b79be92 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4966,6 +4966,12 @@ Return ATTR."
4966 vec (format 4966 vec (format
4967 "%s --color=never -al /dev/null" result)) 4967 "%s --color=never -al /dev/null" result))
4968 (setq result (concat result " --color=never"))) 4968 (setq result (concat result " --color=never")))
4969 ;; This should support file names with special
4970 ;; characters. If this option is not supported, such
4971 ;; file names might fail.
4972 (when (tramp-send-command-and-check
4973 vec (format "%s -b /dev/null" result))
4974 (setq result (concat result " -b")))
4969 (throw 'ls-found result)) 4975 (throw 'ls-found result))
4970 (setq dl (cdr dl)))))) 4976 (setq dl (cdr dl))))))
4971 (tramp-error vec 'file-error "Couldn't find a proper `ls' command")))) 4977 (tramp-error vec 'file-error "Couldn't find a proper `ls' command"))))