From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 2 Jan 2017 18:30:21 +0000 (+0100)
Subject: Check also for "gvfs-monitor-dir.exe" in Tramp
X-Git-Tag: emacs-26.0.90~948
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1d714e41ea73af89b56fb4bf19f8f0c3f443c268;p=emacs.git

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".
---

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."