summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/tramp-sh.el9
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index b0a2c431f95..fec9f10d704 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."