mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00
Code Issues Releases Activity

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

Browse Source 
sequences.
This commit is contained in:
Jürgen Hötzel 2012-12-13 09:38:16 +01:00 committed by Michael Albinus
parent 40d1e43460
commit d754b364fa
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -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> 2012-12-13 Alan Mackenzie <acm@muc.de>
Make CC Mode not hang when _some_ lines end in CRLF. Bug #11841. Make CC Mode not hang when _some_ lines end in CRLF. Bug #11841.

7
lisp/net/tramp-adb.el
View File

@ -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) (if (tramp-wait-for-regexp proc timeout tramp-adb-prompt)
(let (buffer-read-only) (let (buffer-read-only)
(goto-char (point-min)) (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) (forward-line 1)
(delete-region (point-min) (point))) (delete-region (point-min) (point)))
;; Delete the prompt. ;; 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)) (goto-char (point-max))
(re-search-backward tramp-adb-prompt nil t) (re-search-backward tramp-adb-prompt nil t)
(delete-region (point) (point-max))) (delete-region (point) (point-max)))