summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/inotify.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 631425552f8..3472dbec611 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-11 Eli Zaretskii <eliz@gnu.org>
+
+ * inotify.c (Finotify_add_watch): Rename decoded_file_name to
+ encoded_file_name, which is what it is.
+
2012-12-11 Dmitry Antipov <dmantipov@yandex.ru>
Consistently use marker_position and marker_byte_position.
diff --git a/src/inotify.c b/src/inotify.c
index 4db95a069fe..17104c89064 100644
--- a/src/inotify.c
+++ b/src/inotify.c
@@ -325,7 +325,7 @@ is managed internally and there is no corresponding inotify_init. Use
{
uint32_t mask;
Lisp_Object watch_object;
- Lisp_Object decoded_file_name;
+ Lisp_Object encoded_file_name;
Lisp_Object watch_descriptor;
int watchdesc = -1;
@@ -345,8 +345,8 @@ is managed internally and there is no corresponding inotify_init. Use
}
mask = aspect_to_inotifymask (aspect);
- decoded_file_name = ENCODE_FILE (file_name);
- watchdesc = inotify_add_watch (inotifyfd, SSDATA (decoded_file_name), mask);
+ encoded_file_name = ENCODE_FILE (file_name);
+ watchdesc = inotify_add_watch (inotifyfd, SSDATA (encoded_file_name), mask);
if (watchdesc == -1)
report_file_error ("Could not add watch for file", Fcons (file_name, Qnil));