Merge from trunk after 24.3 was moved to emacs-24 branch.

diff --cc lib-src/ChangeLog
Simple merge

diff --cc lib-src/makefile.w32-in
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/ChangeLog
index c81009928deeb384ca740bdf7b5b5e486995ebb5,e762eb13b87b401633bda790c1126d8c93be7676..87f669c5c6e337cf914b52a4d0e5832f07f8feb4
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -628,43 -789,9 +789,43 @@@
        (ns_clear_frame_area): Remove resize handle code.
  
        * nsfns.m (ns_in_resize): Remove.
-       (x_set_icon_name, ns_set_name, ns_set_name_as_filename): Remove
-       ns_in_resize check.
+       (x_set_icon_name, ns_set_name, ns_set_name_as_filename):
+       Remove ns_in_resize check.
  
 +2012-10-07  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * w32term.h (WM_EMACS_FILENOTIFY): New custom message.
 +      (WM_EMACS_END): Bump value by 1.
 +
 +      * w32term.c (lispy_file_action, queue_notifications): New functions.
 +      (syms_of_w32term) <Qadded, Qremoved, Qmodified, Qrenamed_from>
 +      <Qrenamed_to>: New symbols.
 +
 +      * w32notify.c: New file, implement file event notifications for
 +      MS-Windows.
 +
 +      * w32fns.c (w32_wnd_proc): Handle the WM_EMACS_FILENOTIFY message
 +      by posting it to the w32_read_socket queue.
 +
 +      * termhooks.h (enum event_kind) [WINDOWSNT]: New event kind
 +      FILE_NOTIFY_EVENT.
 +
 +      * makefile.w32-in (OBJ2): Add $(BLD)/w32notify.$(O).
 +      (GLOBAL_SOURCES): Add w32notify.c
 +      ($(BLD)/w32notify.$(O)): New set of dependencies.
 +
 +      * lisp.h (syms_of_w32notify) [WINDOWSNT]: Add prototype.
 +
 +      * keyboard.c (kbd_buffer_get_event) [WINDOWSNT]: Handle
 +      FILE_NOTIFY_EVENT.
 +      (syms_of_keyboard) [WINDOWSNT] <Qfile_notify>: New symbol.
 +      (keys_of_keyboard) [WINDOWSNT]: Bind file-notify to
 +      w32notify-handle-event by default.
 +
 +      * emacs.c (main) [WINDOWSNT]: Call syms_of_w32notify.
 +
 +      * alloc.c (NSTATICS): Enlarge to 0x660.
 +
  2012-10-07  Paul Eggert  <eggert@cs.ucla.edu>
  
        Improve sys_siglist detection.

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32proc.c
Simple merge