diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2016-02-21 09:58:55 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2016-02-21 09:58:55 +0100 |
| commit | 5baa001cecbeb3081fb8a9293d45cfe9f19ef844 (patch) | |
| tree | ea0dcbb2928afdcae93631b22b31c0c3b7a949ff /lisp/filenotify.el | |
| parent | 72613557e02d493f195a1c0894ec736b19069f4c (diff) | |
| download | emacs-5baa001cecbeb3081fb8a9293d45cfe9f19ef844.tar.gz emacs-5baa001cecbeb3081fb8a9293d45cfe9f19ef844.tar.bz2 emacs-5baa001cecbeb3081fb8a9293d45cfe9f19ef844.zip | |
Fix Bug#22736
* lisp/filenotify.el (file-notify-callback): Use the proper
descriptor when calling the callback. (Bug#22736)
* test/automated/file-notify-tests.el
(file-notify--test-event-handler): Deactivate trace.
(file-notify-test08-watched-file-in-watched-dir): Bind
`file-notify--test-tmpfile' temporarily in `dir-callback'.
Diffstat (limited to 'lisp/filenotify.el')
| -rw-r--r-- | lisp/filenotify.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/filenotify.el b/lisp/filenotify.el index 66e7fd7a315..ba76baca3b4 100644 --- a/lisp/filenotify.el +++ b/lisp/filenotify.el @@ -273,14 +273,16 @@ EVENT is the cadr of the event in `file-notify-handle-event' (nth 0 entry) (file-name-nondirectory file1))))) ;;(message ;;"file-notify-callback %S %S %S %S %S" - ;;(file-notify--descriptor desc file) action file file1 registered) + ;;(file-notify--descriptor desc (car entry)) + ;;action file file1 registered) (if file1 (funcall callback - `(,(file-notify--descriptor desc file) ,action ,file ,file1)) + `(,(file-notify--descriptor desc (car entry)) + ,action ,file ,file1)) (funcall callback - `(,(file-notify--descriptor desc file) ,action ,file))))) + `(,(file-notify--descriptor desc (car entry)) ,action ,file))))) ;; Modify `file-notify-descriptors'. (when stopped |