Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
1606c2d3
Commit
1606c2d3
authored
Nov 08, 2013
by
Michael Albinus
Browse files
* net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command):
Remove instrumentation code.
parent
1c49d6c2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
24 deletions
+7
-24
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/net/tramp-sh.el
lisp/net/tramp-sh.el
+2
-24
No files found.
lisp/ChangeLog
View file @
1606c2d3
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):
...
...
lisp/net/tramp-sh.el
View file @
1606c2d3
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment