diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2014-03-10 14:36:39 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2014-03-10 14:36:39 +0100 |
| commit | 183d706e358cd10fbb423cbeef6fa8283979fa30 (patch) | |
| tree | a79fa2ef0270b69c703a5e698b6d94505f3a9f16 | |
| parent | d988d8a475f3aaa5cfc3a7fdfd64e8dbc2e60d71 (diff) | |
| download | emacs-183d706e358cd10fbb423cbeef6fa8283979fa30.tar.gz emacs-183d706e358cd10fbb423cbeef6fa8283979fa30.tar.bz2 emacs-183d706e358cd10fbb423cbeef6fa8283979fa30.zip | |
* 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.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0f675a642ff..04b85f0ecd2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index a6bfe7236b1..ee37373a0fa 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -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 |