emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 4f6980a: Fix file notifications on macOS


From: Eli Zaretskii
Subject: master 4f6980a: Fix file notifications on macOS
Date: Thu, 21 Nov 2019 09:39:51 -0500 (EST)

branch: master
commit 4f6980ad6bbe130f72904d443e66cf60ff1d71a4
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix file notifications on macOS
    
    * src/kqueue.c (Fkqueue_add_watch): Don't use encoded file
    names in objects and APIs that expect decoded multibyte
    strings.  (Bug#38287)
---
 src/kqueue.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kqueue.c b/src/kqueue.c
index 76d7fc1..1383d7d 100644
--- a/src/kqueue.c
+++ b/src/kqueue.c
@@ -414,7 +414,7 @@ only when the upper directory of the renamed file is 
watched.  */)
     }
 
   /* Open file.  */
-  file = ENCODE_FILE (file);
+  Lisp_Object encoded_file = ENCODE_FILE (file);
   oflags = O_NONBLOCK;
 #if O_EVTONLY
   oflags |= O_EVTONLY;
@@ -426,7 +426,7 @@ only when the upper directory of the renamed file is 
watched.  */)
 #else
     oflags |= O_NOFOLLOW;
 #endif
-  fd = emacs_open (SSDATA (file), oflags, 0);
+  fd = emacs_open (SSDATA (encoded_file), oflags, 0);
   if (fd == -1)
     report_file_error ("File cannot be opened", file);
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]