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

[Michael Albinus <michael.albinus@gmx.de>]

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

Michael Albinus <michael.albinus@gmx.de> writes:

Hi Spencer,

> That's why I've proposed the alternative, filtering out escape
> sequences. Using existing functions from specialized packages.

Hmm, perhaps the appended simplistic patch would do the job already?
Could you, pls, test?

Best regards, Michael.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1419 bytes --]

diff --git a/lisp/tramp.el b/lisp/tramp.el
index 910d5343..1fd5e0aa 100644
--- a/lisp/tramp.el
+++ b/lisp/tramp.el
@@ -624,9 +624,7 @@ Sometimes the prompt is reported to look like \"login as:\"."
   ;; connection initialization; Tramp redefines the prompt afterwards.
   (rx (| bol "\r")
       (* (not (any "\n#$%>]")))
-      (? "#") (any "#$%>]") (* blank)
-      ;; Escape characters.
-      (* "^[[" (* (any ";" digit)) alpha (* blank)))
+      (? "#") (any "#$%>]") (* blank))
   "Regexp to match prompts from remote shell.
 Normally, Tramp expects you to configure `shell-prompt-pattern'
 correctly, but sometimes it happens that you are connecting to a
@@ -5883,11 +5881,14 @@ Otherwise, return nil."
   "Check, whether REGEXP is contained in process buffer of PROC.
 Erase echoed commands if exists."
   (with-current-buffer (process-buffer proc)
-    (goto-char (point-min))
+    ;; Remove color escape sequences.
+    (when (tramp-search-regexp tramp-display-escape-sequence-regexp)
+      (replace-match ""))

     ;; Check whether we need to remove echo output.  The max length of
     ;; the echo mark regexp is taken for search.  We restrict the
     ;; search for the second echo mark to PIPE_BUF characters.
+    (goto-char (point-min))
     (when (and (tramp-get-connection-property proc "check-remote-echo")
 	       (re-search-forward
 		tramp-echoed-echo-mark-regexp