[Emacs-diffs] trunk r116717: * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):

[Michael Albinus]

------------------------------------------------------------
revno: 116717
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2014-03-10 14:36:39 +0100
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-10 05:33:31 +0000
+++ b/lisp/ChangeLog    2014-03-10 13:36:39 +0000
@@ -1,3 +1,10 @@
+2014-03-10  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/eldoc.el (eldoc-minibuffer-message): Clear

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2014-03-07 14:07:12 +0000
+++ b/lisp/net/tramp-sh.el      2014-03-10 13:36:39 +0000
@@ -3951,7 +3951,8 @@
   ;; 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 @@
                     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 @@
 ;;   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