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

[Michael Albinus]

------------------------------------------------------------
revno: 101975
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-15 14:07:38 +0200
message:
  * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
  Suppress expansion of tabs to spaces.
modified:
  lisp/ChangeLog
  lisp/net/tramp-sh.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-14 14:32:27 +0000
+++ b/lisp/ChangeLog    2010-10-15 12:07:38 +0000
@@ -1,3 +1,8 @@
+2010-10-15  Michael Albinus  <address@hidden>
+
+       * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+       Suppress expansion of tabs to spaces.
+
 2010-10-14  Kenichi Handa  <address@hidden>
 
        * mail/rmail.el (rmail-show-message-1): Catch an error of

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2010-10-06 12:03:29 +0000
+++ b/lisp/net/tramp-sh.el      2010-10-15 12:07:38 +0000
@@ -3709,9 +3709,7 @@
        ;; 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 @@
   (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")