Commit 67c0a6e6 authored by Michael Albinus's avatar Michael Albinus
Browse files

* net/tramp-adb.el (tramp-adb-parse-device-names): Use

`start-process' instead of `call-process'.  Otherwise, the
function might be blocked under MS Windows.
parent 5784e319
2013-03-17 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-adb.el (tramp-adb-parse-device-names): Use
`start-process' instead of `call-process'. Otherwise, the
function might be blocked under MS Windows.
2013-03-17 Leo Liu <sdl.web@gmail.com> 2013-03-17 Leo Liu <sdl.web@gmail.com>
   
Extend eldoc to display info in the mode-line. (Bug#13978) Extend eldoc to display info in the mode-line. (Bug#13978)
......
...@@ -155,12 +155,18 @@ pass to the OPERATION." ...@@ -155,12 +155,18 @@ pass to the OPERATION."
"Return a list of (nil host) tuples allowed to access." "Return a list of (nil host) tuples allowed to access."
(with-timeout (10) (with-timeout (10)
(with-temp-buffer (with-temp-buffer
(when (zerop (call-process tramp-adb-program nil t nil "devices")) ;; `call-process' does not react on timer under MS Windows.
(let (result) ;; That's why we use `start-process'.
(let ((p (start-process
tramp-adb-program (current-buffer) tramp-adb-program "devices"))
result)
(tramp-compat-set-process-query-on-exit-flag p nil)
(while (eq 'run (process-status p))
(sleep-for 0.1))
(goto-char (point-min)) (goto-char (point-min))
(while (search-forward-regexp "^\\(\\S-+\\)[[:space:]]+device$" nil t) (while (search-forward-regexp "^\\(\\S-+\\)[[:space:]]+device$" nil t)
(add-to-list 'result (list nil (match-string 1)))) (add-to-list 'result (list nil (match-string 1))))
result))))) result))))
(defun tramp-adb-handle-expand-file-name (name &optional dir) (defun tramp-adb-handle-expand-file-name (name &optional dir)
"Like `expand-file-name' for Tramp files." "Like `expand-file-name' for Tramp files."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment