mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-11 02:10:35 -08:00
Code Issues Projects Releases Wiki Activity

* net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):

Browse source 
Do not add `nil' to the environment, when there's no remote `locale'.
(tramp-find-inline-encoding): Check, that the remote host has
installed perl, before sending scripts.
This commit is contained in:
Michael Albinus 2014-03-10 14:36:39 +01:00
parent d988d8a475
commit 183d706e35
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2014-03-10 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
Do not add `nil' to the environment, when there's no remote `locale'.
(tramp-find-inline-encoding): Check, that the remote host has
installed perl, before sending scripts.
2014-03-10 Leo Liu <sdl.web@gmail.com>
* emacs-lisp/eldoc.el (eldoc-minibuffer-message): Clear

9
lisp/net/tramp-sh.el
View file

@ -3951,7 +3951,8 @@ process to set up. VEC specifies the connection."
;; Set the environment.
(tramp-message vec 5 "Setting default environment")
(let ((env (append `(,(tramp-get-remote-locale vec))
(let ((env (append (when (tramp-get-remote-locale vec) ; Discard `(nil)'.
`(,(tramp-get-remote-locale vec)))
(copy-sequence tramp-remote-process-environment)))
unset item)
(while env
@ -4090,6 +4091,10 @@ Goes through the list `tramp-local-coding-commands' and
vec 5 "Checking remote test command `%s'" rem-test)
(unless (tramp-send-command-and-check vec rem-test t)
(throw 'wont-work-remote nil)))
;; Check if remote perl exists when necessary.
(when (and (not (stringp rem-enc))
(not (tramp-get-remote-perl vec)))
(throw 'wont-work-remote nil))
;; Check if remote encoding and decoding commands can be
;; called remotely with null input and output. This makes
;; sure there are no syntax errors and the command is really
@ -5314,5 +5319,7 @@ function cell is returned to be applied on a buffer."
;; rsync.
;; * Try telnet+curl as new method. It might be useful for busybox,
;; without built-in uuencode/uudecode.
;; * Try telnet+nc as new method. It might be useful for busybox,
;; without built-in uuencode/uudecode.
;;; tramp-sh.el ends here