[Emacs-diffs] emacs-25 06da00c: Fix Bug#22859

[Michael Albinus]

branch: emacs-25
commit 06da00c6cfb5f3cafbad92bd4584a0f50343a568
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    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 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index f8a5363..61b6d24 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)