martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command):

Browse Source 
Remove instrumentation code.
This commit is contained in:
Michael Albinus
2013-11-08 10:31:50 +01:00
parent 1c49d6c2fe
commit 1606c2d384
2 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@@ -1,3 +1,8 @@
2013-11-08 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command):
Remove instrumentation code.
2013-11-08 Glenn Morris <rgm@gnu.org>
* progmodes/autoconf.el (autoconf-mode):

26
lisp/net/tramp-sh.el
View File

@@ -3576,12 +3576,6 @@ This function expects to be in the right *tramp* buffer."
I.e., for each directory in `tramp-remote-path', it is tested
whether it exists and if so, it is added to the environment
variable PATH."
(when (featurep 'ert)
(ignore-errors
(with-demoted-errors
(message
"tramp-set-remote-path:\n%s\n"
(tramp-send-command-and-read vec "echo PATH=$PATH")))))
(tramp-message vec 5 "Setting $PATH environment variable")
(tramp-send-command
vec (format "PATH=%s; export PATH"
@@ -4837,23 +4831,7 @@ Return ATTR."
remote-path)))))
(defun tramp-get-ls-command (vec)
; (with-tramp-connection-property vec "ls"
(when (featurep 'ert)
(ignore-errors
(with-demoted-errors
(message
"tramp-get-ls-command printenv:\n%s\n"
(tramp-send-command-and-read
vec "echo \"\\\"`(printenv | sort) || exit`\\\"\"")))
(with-demoted-errors
(message
"tramp-get-ls-command getconf PATH:\n%s\n"
(tramp-send-command-and-read
vec "echo \\\"`getconf PATH 2>/dev/null || exit`\\\"")))
(with-demoted-errors
(message
"tramp-get-ls-command whereis ls:\n%s\n"
(tramp-send-command-and-read vec "echo \"\\\"`whereis ls || exit`\\\"\"")))))
(with-tramp-connection-property vec "ls"
(tramp-message vec 5 "Finding a suitable `ls' command")
(or
(catch 'ls-found
@@ -4875,7 +4853,7 @@ Return ATTR."
(setq result (concat result " --color=never")))
(throw 'ls-found result))
(setq dl (cdr dl))))))
(tramp-error vec 'file-error "Couldn't find a proper `ls' command")));)
(tramp-error vec 'file-error "Couldn't find a proper `ls' command"))))
(defun tramp-get-ls-command-with-dired (vec)
(save-match-data