*** /tmp/tramp.el.~2.678.~	Thu Mar 19 17:35:00 2009
--- /tmp/tramp.el	Thu Mar 19 17:35:00 2009
***************
*** 5669,5675 ****
  	  (let ((tramp-end-of-output "$ "))
  	    (tramp-send-command
  	     vec
! 	     (format "PROMPT_COMMAND='' PS1='$ ' PS2='' PS3='' exec %s" shell)
  	     t))
  	  ;; Setting prompts.
  	  (tramp-message vec 5 "Setting remote shell prompt...")
--- 5669,5675 ----
  	  (let ((tramp-end-of-output "$ "))
  	    (tramp-send-command
  	     vec
! 	     (format "PROMPT_COMMAND='' PS1=\\$\\  PS2='' PS3='' exec %s" shell)
  	     t))
  	  ;; Setting prompts.
  	  (tramp-message vec 5 "Setting remote shell prompt...")
***************
*** 5951,5957 ****
      (tramp-send-command
       vec
       (format
!       "exec env ENV='' PROMPT_COMMAND='' PS1='$ ' PS2='' PS3='' %s"
        (tramp-get-method-parameter
         (tramp-file-name-method vec) 'tramp-remote-sh))
       t)
--- 5951,5957 ----
      (tramp-send-command
       vec
       (format
!       "exec env ENV='' PROMPT_COMMAND='' PS1=\\$\\  PS2='' PS3='' %s"
        (tramp-get-method-parameter
         (tramp-file-name-method vec) 'tramp-remote-sh))
       t)