[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115032: * net/tramp-sh.el (tramp-set-remote-path, t
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] trunk r115032: * net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command): |
Date: |
Fri, 08 Nov 2013 09:31:57 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115032
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Fri 2013-11-08 10:31:50 +0100
message:
* net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command):
Remove instrumentation code.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/net/tramp-sh.el trampsh.el-20100913133439-a1faifh29eqoi4nh-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-11-08 08:22:50 +0000
+++ b/lisp/ChangeLog 2013-11-08 09:31:50 +0000
@@ -1,3 +1,8 @@
+2013-11-08 Michael Albinus <address@hidden>
+
+ * net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command):
+ Remove instrumentation code.
+
2013-11-08 Glenn Morris <address@hidden>
* progmodes/autoconf.el (autoconf-mode):
=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el 2013-11-07 11:13:41 +0000
+++ b/lisp/net/tramp-sh.el 2013-11-08 09:31:50 +0000
@@ -3576,12 +3576,6 @@
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 @@
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 @@
(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115032: * net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command):,
Michael Albinus <=