diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2018-11-04 12:51:39 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2018-11-04 12:51:39 +0100 |
| commit | d10036d73759234d67cb587e1876fbfbf7483e83 (patch) | |
| tree | 428cd6f634fd37557a652596b3aa95989f5ad263 /lisp/filenotify.el | |
| parent | b4eb908f858284a7962851fd99c94598f76afa6f (diff) | |
| download | emacs-d10036d73759234d67cb587e1876fbfbf7483e83.tar.gz emacs-d10036d73759234d67cb587e1876fbfbf7483e83.tar.bz2 emacs-d10036d73759234d67cb587e1876fbfbf7483e83.zip | |
Fix Bug#33194
* lisp/autorevert.el (auto-revert-notify-add-watch):
Handle buffers with same descriptor properly.
(auto-revert-notify-handler): Handle all buffers with same
descriptor. (Bug#33194)
* lisp/filenotify.el (file-notify-callback): Simplify.
Diffstat (limited to 'lisp/filenotify.el')
| -rw-r--r-- | lisp/filenotify.el | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/filenotify.el b/lisp/filenotify.el index 59a8c0e88aa..a133f9ea7ec 100644 --- a/lisp/filenotify.el +++ b/lisp/filenotify.el @@ -45,11 +45,11 @@ could use another implementation.") (:constructor nil) (:constructor file-notify--watch-make (directory filename callback))) - ;; Watched directory + ;; Watched directory. directory ;; Watched relative filename, nil if watching the directory. filename - ;; Function to propagate events to + ;; Function to propagate events to. callback) (defun file-notify--watch-absolute-filename (watch) @@ -242,11 +242,10 @@ EVENT is the cadr of the event in `file-notify-handle-event' ;;(message ;;"file-notify-callback %S %S %S %S %S" ;;desc action file file1 watch) - (if file1 - (funcall (file-notify--watch-callback watch) - `(,desc ,action ,file ,file1)) - (funcall (file-notify--watch-callback watch) - `(,desc ,action ,file)))) + (funcall (file-notify--watch-callback watch) + (if file1 + `(,desc ,action ,file ,file1) + `(,desc ,action ,file)))) ;; Send `stopped' event. (when (or stopped |