From 98ca7a4c94bd89a7da25c30eceb357c81b83e98b Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 26 Jan 2018 11:57:41 +0100 Subject: [PATCH] Handle quoted file names in filenotify.el * lisp/filenotify.el (file-notify-add-watch): Do not save quoted file names in `file-notify-descriptors'. * test/lisp/files-tests.el (files-file-name-non-special-notify-handlers): Do not expect to fail. --- lisp/filenotify.el | 5 ++++- test/lisp/files-tests.el | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/filenotify.el b/lisp/filenotify.el index 562ac266e44..442dc891571 100644 --- a/lisp/filenotify.el +++ b/lisp/filenotify.el @@ -307,7 +307,10 @@ FILE is the name of the file whose event is being reported." (unless (functionp callback) (signal 'wrong-type-argument `(,callback))) - (let* ((handler (find-file-name-handler file 'file-notify-add-watch)) + (let* ((quoted (file-name-quoted-p file)) + (file (file-name-unquote file)) + (file-name-handler-alist (if quoted nil file-name-handler-alist)) + (handler (find-file-name-handler file 'file-notify-add-watch)) (dir (directory-file-name (if (file-directory-p file) file diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el index c4c82077016..98a8f9a070b 100644 --- a/test/lisp/files-tests.el +++ b/test/lisp/files-tests.el @@ -339,14 +339,12 @@ be invoked with the right arguments." (verify-visited-file-modtime nil)))))))) (ert-deftest files-file-name-non-special-notify-handlers () - :expected-result :failed (files-tests--with-temp-file tmpfile (let* ((nospecial (concat "/:" tmpfile)) (watch (file-notify-add-watch nospecial '(change) #'ignore))) (should (file-notify-valid-p watch)) (file-notify-rm-watch watch)))) - (ert-deftest files-file-name-non-special-handlers () (files-tests--with-temp-file tmpfile (files-tests--with-temp-dir tmpdir -- 2.39.5