* net/tramp-sh.el (tramp-remote-process-environment): Add "TMOUT=0".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 516833ccaa2f9319b8db3f854ed9bbc29e25f264..2423acc56671c2382622e8f1e96d0e13059c2448 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-18  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp-sh.el (tramp-remote-process-environment): Add "TMOUT=0".
+
 2013-04-18  Tassilo Horn  <tsdh@gnu.org>
 
        * files.el (auto-mode-alist): Delete OpenDocument and StarOffice

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index da2dcc71c5cf13716c4d0bf3860828f34bc4136a..f28df1ce1607198c6705e118c2690a222858b72d 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -422,7 +422,7 @@ as given in your `~/.profile'."
 
 ;;;###tramp-autoload
 (defcustom tramp-remote-process-environment
-  `("HISTFILE=$HOME/.tramp_history" "HISTSIZE=1" "LC_ALL=C"
+  `("HISTFILE=$HOME/.tramp_history" "HISTSIZE=1" "TMOUT=0" "LC_ALL=C"
     ,(format "TERM=%s" tramp-terminal-type)
     "EMACS=t" ;; Deprecated.
     ,(format "INSIDE_EMACS='%s,tramp:%s'" emacs-version tramp-version)