auto upstream

2 files changed, 17 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3390a2e8e7c..22069406451 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2012-12-13  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-adb.el (tramp-adb-file-name-p): Make it a defsubst.
+        Otherwise, there could be errors in autoloading.  (Bug#13151)
+
+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 fea4cb35ea3..5d13d56f638 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -112,7 +112,7 @@
   "Alist of handler functions for Tramp ADB method.")
 
 ;;;###tramp-autoload
-(defun tramp-adb-file-name-p (filename)
+(defsubst tramp-adb-file-name-p (filename)
   "Check if it's a filename for ADB."
   (let ((v (tramp-dissect-file-name filename)))
     (string= (tramp-file-name-method v) tramp-adb-method)))
@@ -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)))