[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1d714e4: Check also for "gvfs-monitor-dir.exe" in T
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 1d714e4: Check also for "gvfs-monitor-dir.exe" in Tramp |
Date: |
Mon, 2 Jan 2017 18:30:36 +0000 (UTC) |
branch: master
commit 1d714e41ea73af89b56fb4bf19f8f0c3f443c268
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Check also for "gvfs-monitor-dir.exe" in Tramp
* lisp/net/tramp-sh.el (tramp-get-remote-gvfs-monitor-dir): Check also
for "gvfs-monitor-dir.exe".
---
lisp/net/tramp-sh.el | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index b0a2c43..fec9f10 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -5409,8 +5409,13 @@ Nonexistent directories are removed from spec."
"Determine remote `gvfs-monitor-dir' command."
(with-tramp-connection-property vec "gvfs-monitor-dir"
(tramp-message vec 5 "Finding a suitable `gvfs-monitor-dir' command")
- (tramp-find-executable
- vec "gvfs-monitor-dir" (tramp-get-remote-path vec) t t)))
+ ;; We distinguish "gvfs-monitor-dir.exe" from cygwin in order to
+ ;; establish better timeouts in filenotify-tests.el. Any better
+ ;; distinction approach would be welcome!
+ (or (tramp-find-executable
+ vec "gvfs-monitor-dir.exe" (tramp-get-remote-path vec) t t)
+ (tramp-find-executable
+ vec "gvfs-monitor-dir" (tramp-get-remote-path vec) t t))))
(defun tramp-get-remote-inotifywait (vec)
"Determine remote `inotifywait' command."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 1d714e4: Check also for "gvfs-monitor-dir.exe" in Tramp,
Michael Albinus <=