Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index d46e34c852514918187a0c7689d7b6c4b0b74dbe..8efc90727e1d33bd9f7a7670793fb8377a6c2211 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2015-01-27  Eli Zaretskii  <eliz@gnu.org>
+
+       * dired.c (directory_files_internal) [WINDOWSNT]: If readdir
+       returns NULL and errno is ENOTDIR, behave as if opendir failed to
+       open the directory.  (Bug#19701)
+
+       * w32.c (sys_readdir): If FindFirstFile fails because the
+       directory doesn't exist, set errno to ENOTDIR.
+
+2015-01-24  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsterm.m (drawRect:): Add block/unblock_input (Bug#19660).
+
 2015-01-21  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix coding.c subscript error