From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.bugs Subject: bug#63539: 29.0.90; TRAMP fails to detect shell prompts containing ] Date: Wed, 17 May 2023 18:56:05 +0200 Message-ID: <87bkiivqvu.fsf@gmx.de> References: <877ct8w4bs.fsf@gmx.de> <87sfbvuk4r.fsf@gmx.de> <87h6sbufv3.fsf@gmx.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4063"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 63539@debbugs.gnu.org To: Spencer Baugh Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed May 17 18:57:15 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pzKSg-0000sN-WC for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 17 May 2023 18:57:15 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzKSW-0000fi-09; Wed, 17 May 2023 12:57:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzKSU-0000fT-64 for bug-gnu-emacs@gnu.org; Wed, 17 May 2023 12:57:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzKST-0002lw-Ut for bug-gnu-emacs@gnu.org; Wed, 17 May 2023 12:57:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzKST-0001ik-N3 for bug-gnu-emacs@gnu.org; Wed, 17 May 2023 12:57:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Michael Albinus Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 17 May 2023 16:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63539 X-GNU-PR-Package: emacs Original-Received: via spool by 63539-submit@debbugs.gnu.org id=B63539.16843425756530 (code B ref 63539); Wed, 17 May 2023 16:57:01 +0000 Original-Received: (at 63539) by debbugs.gnu.org; 17 May 2023 16:56:15 +0000 Original-Received: from localhost ([127.0.0.1]:50825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzKRj-0001hG-G9 for submit@debbugs.gnu.org; Wed, 17 May 2023 12:56:15 -0400 Original-Received: from mout.gmx.net ([212.227.17.21]:58767) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzKRh-0001gy-Mg for 63539@debbugs.gnu.org; Wed, 17 May 2023 12:56:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1684342566; i=michael.albinus@gmx.de; bh=DA08higgwKAjw5MWbFBmrz5K2405afT8yWf/eBXJDVU=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date; b=r3PAtN0i7Boq7NdqDMX56W8rVBFNnTFDt14i1mK4yHLNIRExeHx9jtwSBzsPMg+AY aTvmONTy8jAvSuHCQ9IGwii2mwsQJcW0NOMeA6hgdRiy1//PeUb3lvTwwbeysoayqW pISE1JFDI3QKdJQa6wJSy0G9QL7R4KXidS+0x3OwCNBScfHhyKvjgA5uKW/XJJo0OZ pSeWGXJ8e9kOrL9Z5qZnI1zzeSsU/3Zq8WRlS8gAl9BAC3wl+sr7/M32f+j6XRTY/I 6WgP5KdgB/Ztemmk8gJgPIg0HH+6S6vqOaF4ps6xvFqnloMpRGSdUIYU4uvni/mVw8 EPu1yHjGsKqFQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([185.89.39.13]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M1Hdq-1q25Kp3rQ2-002mi8; Wed, 17 May 2023 18:56:06 +0200 In-Reply-To: <87h6sbufv3.fsf@gmx.de> (Michael Albinus's message of "Wed, 17 May 2023 17:39:28 +0200") X-Provags-ID: V03:K1:A/m/uSU7qLyElAqRGDcUNzaA1XGQvgm0YnNLluGlgYb6Vb8WRuo 4qTl7c3o3Oe8Hdlhzjh2I/F5JhZfihyn/urZk+iI1HThjvF0wrE61B1BNtLQ4zstclr6/cq YBVP8GbzMgtmk+OSm+NMTrywJ/zaB4Sb+962oVQo7N27rK1b2nEKutkdRfhqMNorj0ts7wc Ajr2y9Du/QmS/1ffmZrCQ== UI-OutboundReport: notjunk:1;M01:P0:XZw6NzqL2fU=;bBSRketh2YFo2fJfoc9GOO60uVH ZGSNukv6Yf/J/CFrtG7NMZqElZBAkBJ2Rrabz5NF8LsC74Rps+bsCmjIv3VK+VO8Ja6AiT2gK 6JenmtfCxqu2Jriy3l5wAfIu/pqyxettjYvOeq06Cl1v0cNTFKjubSWs25ZzOb/Uhg/2PLaFm PDMnatXWQ8oKfxADKddiht3/ZmoBCP+3ztnLewEroDRvyKEPH80F56wk2sNVf+EEpFhJ4tMEm UbR9TpblDE32cHeYu4MXcGnwRf49rPb74Bwxe8waHATNMCj/Uqr0DFvuQmQwNuy+49w4bECVD oYz0N8m1TOcFsyP8R4KOuLxzydeqY9dJ7c/JKkDQ02BzlamoU0W3e3oHA4+xvcxVwtu5qmcIu D5cH4KN8XmAOkZl+hM123vrYO8McfG1atQUGihoIkTXVnBL2MBZa5DaTr7+AItXDyxguvNjp+ OQdQV/Gobjxne9v5unPMLyq2CP6yIz+N8iwKbxwowT5XoumUsxFXzvjuv6sZCWgbXZHou1CGS 5ONvUitJO5buULDPR3lxqD8KwIUyrkiAvkUPTCasPfCamxzfVMXc9B7AxoowFKhMswBSJlGu2 ygn0KpHnqU5f1Grl4Q060l+9fh8oTl+XZ26AHB9UhAwWqJGPwxiGuA7eRlywyhB+WWXv5VhhH M2F3eaHV8sLFQ1lFFLSmnjwpAi/LtlDaMgkVWkyOlDbeHdSD1zV9sWbgQgnrPzx8rfFTLr+au yBDjy6yq209kR41iWZW87WQQcBgdGpcpwcDFGVLqV3IlfkcJD1jV34MtQrqBmGymXb76meFt X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:261869 Archived-At: --=-=-= Content-Type: text/plain Michael Albinus 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. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment Content-Transfer-Encoding: quoted-printable diff --git a/lisp/tramp.el b/lisp/tramp.el index 910d5343..1fd5e0aa 100644 =2D-- 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. - (* "=1B[" (* (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 --=-=-=--