*** /home/albinus/src/tramp-stable/lisp/tramp.el.~2.359.2.116.~	2007-10-31 21:36:49.000000000 +0100
--- /home/albinus/src/tramp-stable/lisp/tramp.el	2007-12-23 20:43:19.000000000 +0100
***************
*** 6256,6264 ****
    ;; the last time we sent a command, to avoid tramp-send-command to send
    ;; "echo are you awake".
    (setq tramp-last-cmd-time (current-time))
    (tramp-send-command
     multi-method method user host
!    (format "PROMPT_COMMAND=''; PS1='%s%s%s'; PS2=''; PS3=''"
  	   tramp-rsh-end-of-line
             tramp-end-of-output
  	   tramp-rsh-end-of-line))
--- 6256,6273 ----
    ;; the last time we sent a command, to avoid tramp-send-command to send
    ;; "echo are you awake".
    (setq tramp-last-cmd-time (current-time))
+   (tramp-send-command-internal multi-method method user host
+ 			       "PROMPT_COMMAND=''")
+   (erase-buffer)
+   (tramp-send-command-internal multi-method method user host
+ 			       "PS2=''")
+   (erase-buffer)
+   (tramp-send-command-internal multi-method method user host
+ 			       "PS3=''")
+   (erase-buffer)
    (tramp-send-command
     multi-method method user host
!    (format "PS1='%s%s%s'"
  	   tramp-rsh-end-of-line
             tramp-end-of-output
  	   tramp-rsh-end-of-line))