From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 19 Jul 2020 17:34:16 +0000 (+0200)
Subject: * lisp/net/tramp-adb.el (tramp-adb-prompt): Further simplification.
X-Git-Tag: emacs-28.0.90~6966
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=13ca719a68e02fa0901546f1de7b0a4331a75f9e;p=emacs.git

* lisp/net/tramp-adb.el (tramp-adb-prompt): Further simplification.

Suggested by Mattias Engdegård <mattiase@acm.org>.
---

diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 25e4097a806..c1eb36e3405 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -55,7 +55,7 @@ It is used for TCP/IP devices."
   "When this method name is used, forward all calls to Android Debug Bridge.")
 
 ;;;###tramp-autoload
-(defcustom tramp-adb-prompt "^[^#\\$]*[#\\$][[:space:]]"
+(defcustom tramp-adb-prompt "^[^#$\n\r]*[#$][[:space:]]"
   "Regexp used as prompt in almquist shell."
   :type 'regexp
   :version "28.1"