Merge from origin/emacs-24

ad588af Improve the fix for bug #19701

Conflicts:
	src/ChangeLog

diff --cc src/ChangeLog
index 36a3e8d64d240e9b0daf15353b74f48e34971a22,dc49508973977f0e26cb5d4d3fb5b3865acbc30a..96e6aa25d5e24bb7f5d3cefc7ff13a7a7ad666c0
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,23 -1,15 +1,35 @@@
 -2015-01-28  Eli Zaretskii  <eliz@gnu.org>
 +2015-01-29  Eli Zaretskii  <eliz@gnu.org>
  
+       * dired.c (directory_files_internal, file_name_completion)
+       [WINDOWSNT]: Signal an error when errno is set non-zero by
+       'readdir', regardless of its value.
+ 
+       * w32.c (sys_readdir): Set errno to ENOENT when the directory
+       doesn't exist and to EACCES when it's not accessible to the
+       current user.  Set errno to zero when FindNextFile exhausts the
+       directory, so that callers don't interpret that as an error and
+       don't signal a file-error.
+       (open_unc_volume): Set errno to ENOENT if WNetOpenEnum fails.
++2015-01-29  Eli Zaretskii  <eliz@gnu.org>
++
 +      Use bool for boolean in w32menu.c, w32font.c, w32uniscribe.c.
 +      * w32uniscribe.c (uniscribe_list, uniscribe_match): Use bool where
 +      appropriate.
 +
 +      * w32font.c (struct font_callback_data, w32font_list_internal)
 +      (w32font_driver, w32font_match_internal): Use bool where appropriate.
 +
 +      * w32menu.c (x_activate_menubar, set_frame_menubar)
 +      (w32_dialog_show, initialize_frame_menubar, w32_menu_show)
 +      (is_simple_dialog): Use bool where appropriate.
 +
 +2015-01-28  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Use bool, not int, to track face changes
 +      * xfaces.c (face_change): Rename from face_change_count, and
 +      change from int to bool.  The var is now true (instead of nonzero)
 +      if attributes have changed; this is simpler.  All uses changed.
 +      Fixes: bug#19698
  
  2015-01-27  Eli Zaretskii  <eliz@gnu.org>
  

diff --cc src/dired.c
Simple merge

diff --cc src/w32.c
Simple merge