From: Jürgen Hötzel Date: Thu, 13 Dec 2012 08:38:16 +0000 (+0100) Subject: * net/tramp-adb.el (tramp-adb-wait-for-output): Remove spurious " ^H" X-Git-Tag: emacs-24.3.90~173^2~7^2~607 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d754b364faf73f2e1f2ffaa10caec1f4eabb771c;p=emacs.git * net/tramp-adb.el (tramp-adb-wait-for-output): Remove spurious " ^H" sequences. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3390a2e8e7c..cfc1601b098 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-12-13 Jürgen Hötzel + + * net/tramp-adb.el (tramp-adb-wait-for-output): Remove spurious " ^H" + sequences. + 2012-12-13 Alan Mackenzie 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 fea4cb35ea3..b5b31828bb1 100644 --- 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)))