From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 31 Jul 2019 12:54:08 +0000 (+0200)
Subject: Fix an error in tramp-sh-inotifywait-process-filter
X-Git-Tag: emacs-27.0.90~1810
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c306848c0fe830127ee8d4fd936f17f341ad179b;p=emacs.git

Fix an error in tramp-sh-inotifywait-process-filter

* lisp/net/tramp-sh.el (tramp-sh-inotifywait-process-filter):
Add default FILE to returned event, if inotifywait doesn't tell us.
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 6a82fef4f70..3399b961b2a 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3785,7 +3785,8 @@ file-notify events."
 		 (intern-soft
 		  (replace-regexp-in-string "_" "-" (downcase x))))
 	       (split-string (match-string 1 line) "," 'omit))
-	      (match-string 3 line))))
+	      (or (match-string 3 line)
+		  (file-name-nondirectory (process-get proc 'watch-name))))))
 	;; Usually, we would add an Emacs event now.  Unfortunately,
 	;; `unread-command-events' does not accept several events at
 	;; once.  Therefore, we apply the handler directly.