From: Jürgen Hötzel <juergen@archlinux.org>
Date: Tue, 11 Aug 2015 06:57:45 +0000 (+0200)
Subject: ; Fix prompt in tramp-adb.el
X-Git-Tag: emacs-25.0.90~1373^2~63
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=acde89a2088180831e506d0c4255b306a339e291;p=emacs.git

; Fix prompt in tramp-adb.el

* lisp/net/tramp-adb.el (tramp-adb-prompt): Match leading escape
sequence.  Recent adb version send initial escape sequences, even
when terminal type is set to TERM=dumb.
---

diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index b81f5974cc7..d04d8f63af1 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -59,7 +59,7 @@ It is used for TCP/IP devices."
 
 ;;;###tramp-autoload
 (defcustom tramp-adb-prompt
-  "^\\(?:[[:digit:]]*|?\\)?\\(?:[[:alnum:]]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]"
+  "^\\(?:[[:digit:]]*|?\\)?\\(?:[[:alnum:]\e;\[]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]"
   "Regexp used as prompt in almquist shell."
   :type 'string
   :version "24.4"