diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2019-06-14 19:45:00 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2019-06-14 19:45:00 +0200 |
| commit | 0518e3ca98e0d6d5d96323d4f4a2246b60fe28d9 (patch) | |
| tree | e39cc32c0e1c4874c3bb32d71e18f8e0bae59037 /lisp/net | |
| parent | 1d2e4d22c922f94d6f4b75a5ead18cbc679c5dfe (diff) | |
| download | emacs-0518e3ca98e0d6d5d96323d4f4a2246b60fe28d9.tar.gz | |
Fix problem in remote file notification
* lisp/net/tramp-sh.el (tramp-sh-gio-monitor-process-filter)
(tramp-sh-gvfs-monitor-dir-process-filter)
(tramp-sh-inotifywait-process-filter): Do not kill the process.
Let `file-notify-rm-watch' do the job.
* test/lisp/filenotify-tests.el (file-notify-test03-events)
(file-notify-test05-file-validity)
(file-notify-test09-watched-file-in-watched-dir): Do not
special-case remote files.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp-sh.el | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 3d572ad0b6d..d7db69a5ddb 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3699,10 +3699,6 @@ Fall back to normal file name handler if no Tramp handler exists." (concat remote-prefix file) (when file1 (concat remote-prefix file1))))) (setq string (replace-match "" nil nil string)) - ;; Remove watch when file or directory to be watched is deleted. - (when (and (member (cl-caadr object) '(moved deleted)) - (string-equal file (process-get proc 'watch-name))) - (delete-process proc)) ;; Usually, we would add an Emacs event now. Unfortunately, ;; `unread-command-events' does not accept several events at ;; once. Therefore, we apply the handler directly. @@ -3754,10 +3750,6 @@ file-notify events." (concat remote-prefix file) (when file1 (concat remote-prefix file1))))) (setq string (replace-match "" nil nil string)) - ;; Remove watch when file or directory to be watched is deleted. - (when (and (member (cl-caadr object) '(moved deleted)) - (string-equal file (process-get proc 'watch-name))) - (delete-process proc)) ;; Usually, we would add an Emacs event now. Unfortunately, ;; `unread-command-events' does not accept several events at ;; once. Therefore, we apply the handler directly. @@ -3794,9 +3786,6 @@ file-notify events." (replace-regexp-in-string "_" "-" (downcase x)))) (split-string (match-string 1 line) "," 'omit)) (match-string 3 line)))) - ;; Remove watch when file or directory to be watched is deleted. - (when (member (cl-caadr object) '(move-self delete-self ignored)) - (delete-process proc)) ;; Usually, we would add an Emacs event now. Unfortunately, ;; `unread-command-events' does not accept several events at ;; once. Therefore, we apply the handler directly. |