aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJürgen Hötzel2015-08-11 08:57:45 +0200
committerMichael Albinus2015-08-11 08:57:45 +0200
commitacde89a2088180831e506d0c4255b306a339e291 (patch)
tree9d8725f55a9e1c89c9150c9ccfd81f20a97c0839
parentd7df36e745a5ba480559b6c8b5ebc93a18fe9bd1 (diff)
downloademacs-acde89a2088180831e506d0c4255b306a339e291.tar.gz
emacs-acde89a2088180831e506d0c4255b306a339e291.zip
; 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.
-rw-r--r--lisp/net/tramp-adb.el2
1 files changed, 1 insertions, 1 deletions
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."
59 59
60;;;###tramp-autoload 60;;;###tramp-autoload
61(defcustom tramp-adb-prompt 61(defcustom tramp-adb-prompt
62 "^\\(?:[[:digit:]]*|?\\)?\\(?:[[:alnum:]]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]" 62 "^\\(?:[[:digit:]]*|?\\)?\\(?:[[:alnum:]\e;\[]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]"
63 "Regexp used as prompt in almquist shell." 63 "Regexp used as prompt in almquist shell."
64 :type 'string 64 :type 'string
65 :version "24.4" 65 :version "24.4"