aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2007-11-19 00:25:31 +0000
committerDan Nicolaescu2007-11-19 00:25:31 +0000
commit282e1e37cb1100b5549fe987ef1882e9be670375 (patch)
treefe4f08928747ddd6145ea95165f7c344f8fe27fc
parentdb283402061f3207cf82784b3207c88d9c23bb00 (diff)
downloademacs-282e1e37cb1100b5549fe987ef1882e9be670375.tar.gz
emacs-282e1e37cb1100b5549fe987ef1882e9be670375.zip
* net/tramp.el (tramp-terminal-type): Remove duplicated
definition.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp.el8
2 files changed, 5 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ae2d5c9b3e..a495ea660ac 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-11-18 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * net/tramp.el (tramp-terminal-type): Remove duplicated
4 definition.
5
12007-11-19 Glenn Morris <rgm@gnu.org> 62007-11-19 Glenn Morris <rgm@gnu.org>
2 7
3 * emacs-lisp/check-declare.el (check-declare-verify): If fnfile 8 * emacs-lisp/check-declare.el (check-declare-verify): If fnfile
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1ccf02d4353..83e2e9bf685 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -912,14 +912,6 @@ directories for POSIX compatible commands."
912 (const :tag "Default Directories" tramp-default-remote-path) 912 (const :tag "Default Directories" tramp-default-remote-path)
913 (string :tag "Directory")))) 913 (string :tag "Directory"))))
914 914
915(defcustom tramp-terminal-type "dumb"
916 "*Value of TERM environment variable for logging in to remote host.
917Because Tramp wants to parse the output of the remote shell, it is easily
918confused by ANSI color escape sequences and suchlike. Often, shell init
919files conditionalize this setup based on the TERM environment variable."
920 :group 'tramp
921 :type 'string)
922
923(defcustom tramp-remote-process-environment 915(defcustom tramp-remote-process-environment
924 `("HISTFILE=$HOME/.tramp_history" "HISTSIZE=1" "LC_TIME=C" 916 `("HISTFILE=$HOME/.tramp_history" "HISTSIZE=1" "LC_TIME=C"
925 ,(concat "TERM=" tramp-terminal-type) 917 ,(concat "TERM=" tramp-terminal-type)