summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2010-10-15 14:07:38 +0200
committerMichael Albinus <michael.albinus@gmx.de>2010-10-15 14:07:38 +0200
commitaa095b2db98ae149737f8de00ee733b1d257ed33 (patch)
tree38b6d67688139052283755630d23671a993b8061 /lisp
parent7c9b11be16ceb080f052371786ac111ccf8d43fc (diff)
downloademacs-aa095b2db98ae149737f8de00ee733b1d257ed33.tar.gz
* net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
Suppress expansion of tabs to spaces.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp-sh.el13
2 files changed, 15 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9909bf1dc5c..4097b914223 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-15 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+ Suppress expansion of tabs to spaces.
+
2010-10-14 Kenichi Handa <handa@m17n.org>
* mail/rmail.el (rmail-show-message-1): Catch an error of
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 13658d2370a..474c39adeed 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3709,9 +3709,7 @@ process to set up. VEC specifies the connection."
;; because we're running on a non-MULE Emacs. Let's try
;; stty, instead.
(tramp-send-command vec "stty -onlcr" t))))
- ;; Dump stty settings in the traces.
- (when (>= tramp-verbose 9)
- (tramp-send-command vec "stty -a" t))
+
(tramp-send-command vec "set +o vi +o emacs" t)
;; Check whether the output of "uname -sr" has been changed. If
@@ -3782,12 +3780,21 @@ process to set up. VEC specifies the connection."
(when (string-match "^IRIX64" (tramp-get-connection-property vec "uname" ""))
(tramp-send-command vec "set +H" t))
+ ;; On BSD-like systems, ?\t is expanded to spaces. Suppress this.
+ (when (string-match "BSD\\|Darwin"
+ (tramp-get-connection-property vec "uname" ""))
+ (tramp-send-command vec "stty -oxtabs" t))
+
;; Set `remote-tty' process property.
(ignore-errors
(let ((tty (tramp-send-command-and-read vec "echo \\\"`tty`\\\"")))
(unless (zerop (length tty))
(tramp-compat-process-put proc 'remote-tty tty))))
+ ;; Dump stty settings in the traces.
+ (when (>= tramp-verbose 9)
+ (tramp-send-command vec "stty -a" t))
+
;; Set the environment.
(tramp-message vec 5 "Setting default environment")