mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-22 18:35:09 +00:00
Code Issues Releases Activity

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

Browse Source 
`start-process' instead of `call-process'.  Otherwise, the
function might be blocked under MS Windows.
This commit is contained in:
Michael Albinus 2013-03-17 18:23:05 +01:00
parent 5784e31964
commit 67c0a6e63e
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
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>
Extend eldoc to display info in the mode-line. (Bug#13978)

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

@ -155,12 +155,18 @@ pass to the OPERATION."
"Return a list of (nil host) tuples allowed to access."
(with-timeout (10)
(with-temp-buffer
(when (zerop (call-process tramp-adb-program nil t nil "devices"))
(let (result)
(goto-char (point-min))
(while (search-forward-regexp "^\\(\\S-+\\)[[:space:]]+device$" nil t)
(add-to-list 'result (list nil (match-string 1))))
result)))))
;; `call-process' does not react on timer under MS Windows.
;; 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))
(while (search-forward-regexp "^\\(\\S-+\\)[[:space:]]+device$" nil t)
(add-to-list 'result (list nil (match-string 1))))
result))))
(defun tramp-adb-handle-expand-file-name (name &optional dir)
"Like `expand-file-name' for Tramp files."