[Emacs-diffs] /srv/bzr/emacs/trunk r111215: * net/tramp-adb.el (tramp-adb-wait-for-output): Remove spurious " ^H"

[Michael Albinus]

------------------------------------------------------------
revno: 111215
author: Jürgen Hötzel <address@hidden>
committer: Michael Albinus <address@hidden
branch nick: trunk
timestamp: Thu 2012-12-13 09:38:16 +0100
message:
  * net/tramp-adb.el (tramp-adb-wait-for-output): Remove spurious " ^H"
  sequences.
modified:
  lisp/ChangeLog
  lisp/net/tramp-adb.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-13 05:29:15 +0000
+++ b/lisp/ChangeLog    2012-12-13 08:38:16 +0000
@@ -1,3 +1,8 @@
+2012-12-13  Jürgen Hötzel  <address@hidden>
+
+       * net/tramp-adb.el (tramp-adb-wait-for-output): Remove spurious " ^H"
+       sequences.
+
 2012-12-13  Alan Mackenzie  <address@hidden>
 
        Make CC Mode not hang when _some_ lines end in CRLF.  Bug #11841.

=== modified file 'lisp/net/tramp-adb.el'
--- a/lisp/net/tramp-adb.el     2012-12-06 07:33:20 +0000
+++ b/lisp/net/tramp-adb.el     2012-12-13 08:38:16 +0000
@@ -933,10 +933,15 @@
     (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)))