Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 37e6d20eb8305cb046f19c1f8012e6de994f578d..f0ec092c068d76fafc983d48f45023b33b6d643c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2015-02-26  Eli Zaretskii  <eliz@gnu.org>
+
+       * dispextern.h (FACE_FOR_CHAR): Fix the commentary.
+
+2015-02-26  Hans Wennborg  <hwennborg@google.com>  (tiny change)
+
+       * emacs.c (decode_env_path): Add parentheses around ternary
+       operator to increase readability and pacify compiler warnings.
+
+2015-02-26  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32.c (sys_readdir): Map ERROR_NOT_READY (as in "device not
+       ready") to ENOENT.
+
 2015-02-26  Paul Eggert  <eggert@cs.ucla.edu>
 
        * xfns.c (x_real_pos_and_offsets): Fix pointer signedness.