aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2016-03-02 10:24:55 +0000
committerMichael Albinus2016-03-02 10:24:55 +0000
commit06da00c6cfb5f3cafbad92bd4584a0f50343a568 (patch)
tree9f440df29089ca76fae753b84c781c248b523d7c
parentab30bf5e8736f1414def53adae76a257fa482e53 (diff)
downloademacs-06da00c6cfb5f3cafbad92bd4584a0f50343a568.tar.gz
emacs-06da00c6cfb5f3cafbad92bd4584a0f50343a568.zip
Fix Bug#22859
* lisp/filenotify.el (file-notify-callback): Return a `deleted' event in case of kqueue and file1 is nil. (Bug#22859)
-rw-r--r--lisp/filenotify.el6
1 files 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'
197 '(attribute-changed changed created deleted renamed)) 197 '(attribute-changed changed created deleted renamed))
198 action) 198 action)
199 ((memq action '(moved rename)) 199 ((memq action '(moved rename))
200 (setq file1 (file-notify--event-file1-name event)) 200 ;; The kqueue rename event does not return file1 in
201 'renamed) 201 ;; case a file monitor is established.
202 (if (setq file1 (file-notify--event-file1-name event))
203 'renamed 'deleted))
202 ((eq action 'ignored) 204 ((eq action 'ignored)
203 (setq stopped t actions nil)) 205 (setq stopped t actions nil))
204 ((memq action '(attrib link)) 'attribute-changed) 206 ((memq action '(attrib link)) 'attribute-changed)