2 files changed, 15 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 19135944b17..e0cbd35d5fc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-15  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-open-connection-setup-interactive-shell):
+        Suppress expansion of tabs to spaces.
+
 2010-10-15  Kenichi Handa  <handa@m17n.org>
 
         * international/characters.el: Add category '|' (word breakable)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index d5d1606c617..01317ac3708 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -7013,9 +7013,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
@@ -7086,11 +7084,20 @@ 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)) (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")