* net/tramp-adb.el (tramp-adb-wait-for-output): Remove spurious " ^H"

sequences.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3390a2e8e7c347eaf6a94de28a9c079e6dd74448..cfc1601b098320201752dd9995af3e51c808c580 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-13  Jürgen Hötzel  <juergen@archlinux.org>
+
+       * net/tramp-adb.el (tramp-adb-wait-for-output): Remove spurious " ^H"
+       sequences.
+
 2012-12-13  Alan Mackenzie  <acm@muc.de>
 
        Make CC Mode not hang when _some_ lines end in CRLF.  Bug #11841.

diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index fea4cb35ea3463bddd1eac2e3f625e9c9e634607..b5b31828bb163f2d5f3cfd781fd94773f7d252bf 100644 (file)
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -933,10 +933,15 @@ COMMAND is nil, just sends `echo $?'.  Returns the exit status found."
     (if (tramp-wait-for-regexp proc timeout tramp-adb-prompt)
        (let (buffer-read-only)
          (goto-char (point-min))
-         (when (re-search-forward tramp-adb-prompt (point-at-eol) t)
+         ;; ADB terminal sends "^H" sequences.
+         (when (re-search-forward "<\b+" (point-at-eol) t)
            (forward-line 1)
            (delete-region (point-min) (point)))
          ;; Delete the prompt.
+         (goto-char (point-min))
+         (when (re-search-forward tramp-adb-prompt (point-at-eol) t)
+           (forward-line 1)
+           (delete-region (point-min) (point)))
          (goto-char (point-max))
          (re-search-backward tramp-adb-prompt nil t)
          (delete-region (point) (point-max)))