From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 18 Jul 2019 18:26:24 +0000 (+0200)
Subject: Determine `file-notify' handler in Tramp from `special-event-map'.
X-Git-Tag: emacs-27.0.90~1863
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71ce14a83e424b7524325e85d9fffde732943754;p=emacs.git

Determine `file-notify' handler in Tramp from `special-event-map'.

* lisp/net/tramp-sh.el (tramp-sh-gio-monitor-process-filter)
(tramp-sh-gvfs-monitor-dir-process-filter)
(tramp-sh-inotifywait-process-filter): Determine `file-notify'
handler from `special-event-map'.
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 9a0ead47552..170993787b7 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3704,7 +3704,7 @@ Fall back to normal file name handler if no Tramp handler exists."
 	;; once.  Therefore, we apply the handler directly.
 	(when (member (cl-caadr object) events)
 	  (tramp-compat-funcall
-	   'file-notify-handle-event
+	   (cdr (assq 'file-notify special-event-map))
 	   `(file-notify ,object file-notify-callback)))))
 
     ;; Save rest of the string.
@@ -3755,7 +3755,7 @@ file-notify events."
 	;; once.  Therefore, we apply the handler directly.
 	(when (member (cl-caadr object) events)
 	  (tramp-compat-funcall
-	   'file-notify-handle-event
+	   (cdr (assq 'file-notify special-event-map))
 	   `(file-notify ,object file-notify-callback)))))
 
     ;; Save rest of the string.
@@ -3791,7 +3791,7 @@ file-notify events."
 	;; once.  Therefore, we apply the handler directly.
 	(when (member (cl-caadr object) events)
 	  (tramp-compat-funcall
-	   'file-notify-handle-event
+	   (cdr (assq 'file-notify special-event-map))
 	   `(file-notify ,object file-notify-callback)))))))
 
 (defun tramp-sh-handle-file-system-info (filename)