[PATCH] Revert my previous patch. \\' *is* needed.

[Steve Youngs]

Fixing my blunder, sorry Kai.

NOTE: This patch has been committed.


Tramp patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected:               lisp/ChangeLog
Source files diff command:    cvs -q diff -uN
Files affected:               lisp/tramp.el

Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v
retrieving revision 2.129
diff -u -U0 -r2.129 ChangeLog
--- lisp/ChangeLog      19 Jul 2002 07:51:47 -0000      2.129
+++ lisp/ChangeLog      19 Jul 2002 13:27:48 -0000
@@ -7,0 +8,6 @@
+       * tramp.el: Revert my previous patch.  It's better to work around
+       the colour prompt problem outside of Tramp, eg in ~/.bashrc or
+       similar. 
+
+2002-07-19  Steve Youngs  <address@hidden>
+
Index: lisp/tramp.el
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v
retrieving revision 2.133
diff -u -u -r2.133 tramp.el
--- lisp/tramp.el       19 Jul 2002 07:51:47 -0000      2.133
+++ lisp/tramp.el       19 Jul 2002 13:27:34 -0000
@@ -3589,7 +3589,7 @@
        (concat "PS1='$ ' ; exec " shell)) ;
       (unless (tramp-wait-for-regexp
                (get-buffer-process (current-buffer))
-               60 (format "\\(\\$ *\\|%s\\)" shell-prompt-pattern))
+               60 (format "\\(\\$ *\\|\\(%s\\)\\'\\)" shell-prompt-pattern))
         (pop-to-buffer (buffer-name))
         (error "Couldn't find remote `%s' prompt." shell))
       (process-send-string nil (format "PS1='%s%s%s'; PS2=''; PS3=''%s"
@@ -3732,7 +3732,7 @@
         (tramp-message 9 "Waiting 30s for remote shell to come up...")
         (unless (setq found
                       (tramp-wait-for-regexp
-                       p 30 (format "\\(%s\\)\\|\\(%s\\)"
+                       p 30 (format "\\(%s\\)\\|\\(%s\\)\\'"
                                     tramp-wrong-passwd-regexp
                                     shell-prompt-pattern)))
           (pop-to-buffer (buffer-name))
@@ -3806,7 +3806,7 @@
               (tramp-wait-for-regexp
                p 60
                (format
-                "\\(%s\\)\\|\\(%s\\)"
+                "\\(%s\\)\\|\\(%s\\)\\'"
                 tramp-password-prompt-regexp
                 shell-prompt-pattern)))
         (unless found
@@ -3825,7 +3825,7 @@
           (tramp-enter-password p (nth 1 found))
           (tramp-message 9 "Sent password, waiting 60s for remote shell 
prompt")
           (setq found (tramp-wait-for-regexp p 60
-                                             (format "\\(%s\\)\\|\\(%s\\)"
+                                             (format "\\(%s\\)\\|\\(%s\\)\\'"
                                                      tramp-wrong-passwd-regexp
                                                      shell-prompt-pattern))))
         (unless found
@@ -3891,7 +3891,7 @@
         (tramp-message 9 "Waiting 30s for shell or password prompt...")
         (unless (setq found (tramp-wait-for-regexp
                              p 30
-                             (format "\\(%s\\)\\|\\(%s\\)"
+                             (format "\\(%s\\)\\|\\(%s\\)\\'"
                                      tramp-password-prompt-regexp
                                      shell-prompt-pattern)))
           (pop-to-buffer (buffer-name))
@@ -3905,7 +3905,7 @@
           (tramp-message 9 "Waiting 30s for remote shell to come up...")
           (unless (setq found
                         (tramp-wait-for-regexp
-                         p 30 (format "\\(%s\\)\\|\\(%s\\)"
+                         p 30 (format "\\(%s\\)\\|\\(%s\\)\\'"
                                       tramp-wrong-passwd-regexp
                                       shell-prompt-pattern)))
             (pop-to-buffer (buffer-name))
@@ -3964,7 +3964,7 @@
         (process-kill-without-query p)
         (tramp-message 9 "Waiting 60s for local shell to come up...")
         (unless (tramp-wait-for-regexp
-                p 60 (format "%s" shell-prompt-pattern))
+                p 60 (format "%s\\'" shell-prompt-pattern))
           (pop-to-buffer (buffer-name))
           (kill-process p)
           (error "Couldn't find local shell prompt"))
@@ -40
       (pop-to-buffer (buffer-name))
       (error "Couldn't `echo foo; echo bar' to determine line endings'"))
     (goto-char (point-min))
@@ -4279,7 +4279,7 @@
         (tramp-message 9 "Trying `stty -onlcr'")
         (process-send-string nil (format "stty -onlcr%s" 
tramp-rsh-end-of-line))
         (unless (tramp-wait-for-regexp
-                 p 30 (format "\\(\\$ *\\|%s\\)" shell-prompt-pattern))
+                 p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
           (pop-to-buffer (buffer-name))
           (error "Couldn't `stty -onlcr', see buffer `%s'" (buffer-name))))))
   (erase-buffer)
@@ -4289,7 +4289,7 @@
    nil (format "HISTFILE=$HOME/.tramp_history; HISTSIZE=1%s"
                tramp-rsh-end-of-line))
   (unless (tramp-wait-for-regexp
-           p 30 (format "\\(\\$ *\\|%s\\)" shell-prompt-pattern))
+           p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
     (pop-to-buffer (buffer-name))
     (error (concat "Couldn't `HISTFILE=$HOME/.tramp_history; "
                    "HISTSIZE=1', see buffer `%s'")
@@ -4300,7 +4300,7 @@
    nil (format "set +o vi +o emacs%s"      ;mustn't `>/dev/null' with AIX?
                tramp-rsh-end-of-line))
   (unless (tramp-wait-for-regexp
-           p 30 (format "\\(\\$ *\\|%s\\)" shell-prompt-pattern))
+           p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
     (pop-to-buffer (buffer-name))
     (error "Couldn't `set +o vi +o emacs', see buffer `%s'"
            (buffer-name)))
@@ -4310,7 +4310,7 @@
    nil (format "unset MAIL MAILCHECK MAILPATH 1>/dev/null 2>/dev/null%s"
                tramp-rsh-end-of-line))
   (unless (tramp-wait-for-regexp
-           p 30 (format "\\(\\$ *\\|%s\\)" shell-prompt-pattern))
+           p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
     (pop-to-buffer (buffer-name))
     (error "Couldn't `unset MAIL MAILCHECK MAILPATH', see buffer `%s'"
            (buffer-name)))
@@ -4319,7 +4319,7 @@
   (process-send-string
    nil (format "unset CDPATH%s" tramp-rsh-end-of-line))
   (unless (tramp-wait-for-regexp
-           p 30 (format "\\(\\$ *\\|%s\\)" shell-prompt-pattern))
+           p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
     (pop-to-buffer (buffer-name))
     (error "Couldn't `unset CDPATH', see buffer `%s'"
            (buffer-name)))

-- 
|---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
|            XEmacs - It's not just an editor.             |
|                    It's a way of life.                   |
|------------------------------------<address@hidden>---|