bug#63539: 29.0.90; TRAMP fails to detect shell prompts containing ]

[Spencer Baugh <sbaugh@janestreet.com>]

Michael Albinus <michael.albinus@gmx.de> writes:
> Michael Albinus <michael.albinus@gmx.de> writes:
>
> Hi Spencer,
>
>> Well, some of the regression tests fail. I'm analyzing what's up,
>> likely I'll try it with another approach.
>>
>> I'll let you know when there is something to test.
>
> This time the regression tests have (almost) succeeded. Remaining fails
> are not related to this change.
>
> I've pushed everything to master, could you pls test? The change is a
> variation of your proposal to extend shell prompt regexps with the
> comtroö sequences. However, I haven't done this as part of the regexps
> themselves. Rather, I've appended the control sequences regexp on the
> fly, where needed. This minimizes the hassle for people who want to
> customize the user options.
>
> Best regards, Michael.

Hmm, this change doesn't seem to fix my issue.  In fact, this change
introduces a regression for me: I'm no longer able to use TRAMP ssh on
my other machines which have color codes at the end of their prompt,
which did work out of the box on Emacs 29!

I'm guessing the reason is because this version of the regexp doesn't
support multiple escape codes, or blanks in between/at the end of the
escape codes?

The following patch on top both fixes the regression and also fixes my
issue:

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index f986d65d944..1a067c8f9d9 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -5711,10 +5711,10 @@ tramp-process-one-action
   (let ((case-fold-search t)
 	(shell-prompt-pattern
 	 (rx (regexp shell-prompt-pattern)
-	     (? (regexp ansi-color-control-seq-regexp))))
+	     (* (seq (regexp ansi-color-control-seq-regexp) (* blank)))))
 	(tramp-shell-prompt-pattern
 	 (rx (regexp tramp-shell-prompt-pattern)
-	     (? (regexp ansi-color-control-seq-regexp))))
+             (* (seq (regexp ansi-color-control-seq-regexp) (* blank)))))
 	tramp-process-action-regexp
 	found todo item pattern action)
     (while (not found)