From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 31 Oct 2015 13:42:16 +0000 (+0100)
Subject: Minor fix in filenotify.el
X-Git-Tag: emacs-25.0.90~951
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=547a23469a20b7fa90c9a3554b8f7fb58fe100ab;p=emacs.git

Minor fix in filenotify.el

* lisp/filenotify.el (file-notify--event-file-name)
(file-notify--event-file1-name): Normalize result with
`directory-file-name'.
---

diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index 6a180a86570..132f1644f8f 100644
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -100,17 +100,19 @@ It is a form ((DESCRIPTOR ACTION FILE [FILE1-OR-COOKIE]) CALLBACK).")
 
 (defun file-notify--event-file-name (event)
   "Return file name of file notification event, or nil."
-  (expand-file-name
-   (or  (and (stringp (nth 2 event)) (nth 2 event)) "")
-   (car (gethash (car event) file-notify-descriptors))))
+  (directory-file-name
+   (expand-file-name
+    (or  (and (stringp (nth 2 event)) (nth 2 event)) "")
+    (car (gethash (car event) file-notify-descriptors)))))
 
 ;; Only `gfilenotify' could return two file names.
 (defun file-notify--event-file1-name (event)
   "Return second file name of file notification event, or nil.
 This is available in case a file has been moved."
   (and (stringp (nth 3 event))
-       (expand-file-name
-	(nth 3 event) (car (gethash (car event) file-notify-descriptors)))))
+       (directory-file-name
+        (expand-file-name
+         (nth 3 event) (car (gethash (car event) file-notify-descriptors))))))
 
 ;; Cookies are offered by `inotify' only.
 (defun file-notify--event-cookie (event)
diff --git a/test/automated/file-notify-tests.el b/test/automated/file-notify-tests.el
index 222bdc52928..d848f4b9c65 100644
--- a/test/automated/file-notify-tests.el
+++ b/test/automated/file-notify-tests.el
@@ -623,7 +623,7 @@ Don't wait longer than TIMEOUT seconds for the events to be delivered."
 
 ;; TODO:
 
-;; * It does not work yet for local gfilenotify and remote inotifywait.
+;; * It does not work yet for local gfilenotify.
 ;; * For w32notify, no stopped events arrive when a directory is removed.
 
 (provide 'file-notify-tests)