From 06da00c6cfb5f3cafbad92bd4584a0f50343a568 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 2 Mar 2016 10:24:55 +0000 Subject: [PATCH] Fix Bug#22859 * lisp/filenotify.el (file-notify-callback): Return a `deleted' event in case of kqueue and file1 is nil. (Bug#22859) --- lisp/filenotify.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/filenotify.el b/lisp/filenotify.el index f8a53631135..61b6d240e6e 100644 --- a/lisp/filenotify.el +++ b/lisp/filenotify.el @@ -197,8 +197,10 @@ EVENT is the cadr of the event in `file-notify-handle-event' '(attribute-changed changed created deleted renamed)) action) ((memq action '(moved rename)) - (setq file1 (file-notify--event-file1-name event)) - 'renamed) + ;; The kqueue rename event does not return file1 in + ;; case a file monitor is established. + (if (setq file1 (file-notify--event-file1-name event)) + 'renamed 'deleted)) ((eq action 'ignored) (setq stopped t actions nil)) ((memq action '(attrib link)) 'attribute-changed) -- 2.39.2