Merge from trunk.

diff --cc lisp/ChangeLog
Simple merge

diff --cc src/ChangeLog
index b573f8c1476788bda757b9db0d42f6c4f16b5d39,827850e332d0d1bf00452bacdb9233d7f428cd66..007a73f79883f1a865191344fe133cb1d235ddbd
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -460,73 -559,39 +559,73 @@@
        but it still has blocs in it, don't return it to the system,
        instead of aborting.  (Bug#12402)
  
- 2012-10-07  Jan Djärv  <jan.h.d@swipnet.se>
- 
-       * nsterm.m (ns_dumpglyphs_image): Only draw slice of image (Bug#12506).
- 
-       * nsterm.m (ns_update_auto_hide_menu_bar): Remove defintion of
-       MAC_OS_X_VERSION_10_6.
-       (syms_of_nsterm): Remove comment about Panther and above for
-       ns-antialias-text.
-       * nsterm.h (MAC_OS_X_VERSION_10_3, onTiger): Remove.
-       (EmacsApp): Remove check for >= MAC_OS_X_VERSION_10_4.
-       (struct nsfont_info): Remove check for >= MAC_OS_X_VERSION_10_3.
- 
-       * nsselect.m (ns_string_from_pasteboard): Remove check for >=
-       MAC_OS_X_VERSION_10_4.
- 
-       * nsmenu.m (fillWithWidgetValue:): Remove code for <
-       MAC_OS_X_VERSION_10_2.
- 
-       * nsimage.m (setPixmapData, getPixelAtX, setAlphaAtX): Remove onTiger.
- 
-       * nsfns.m (Fns_list_services): Remove comment and check for OSX < 10.4.
-       (ns_do_applescript): Remove check for >= MAC_OS_X_VERSION_10_4.
- 
-       * nsterm.m (ns_in_resize): Remove (Bug#12479).
-       (ns_resize_handle_rect, mouseDown, mouseUp, mouseDragged): Remove.
-       (ns_clear_frame, sendEvent, windowDidResize, drawRect:): Remove
-       ns_in_resize check.
-       (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.
- 
+ 2012-10-07  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * nsterm.m (ns_dumpglyphs_image): Only draw slice of image (Bug#12506).
+ 
+       * nsterm.m (ns_update_auto_hide_menu_bar): Remove defintion of
+       MAC_OS_X_VERSION_10_6.
+       (syms_of_nsterm): Remove comment about Panther and above for
+       ns-antialias-text.
+       * nsterm.h (MAC_OS_X_VERSION_10_3, onTiger): Remove.
+       (EmacsApp): Remove check for >= MAC_OS_X_VERSION_10_4.
+       (struct nsfont_info): Remove check for >= MAC_OS_X_VERSION_10_3.
+ 
+       * nsselect.m (ns_string_from_pasteboard): Remove check for >=
+       MAC_OS_X_VERSION_10_4.
+ 
+       * nsmenu.m (fillWithWidgetValue:): Remove code for <
+       MAC_OS_X_VERSION_10_2.
+ 
+       * nsimage.m (setPixmapData, getPixelAtX, setAlphaAtX): Remove onTiger.
+ 
+       * nsfns.m (Fns_list_services): Remove comment and check for OSX < 10.4.
+       (ns_do_applescript): Remove check for >= MAC_OS_X_VERSION_10_4.
+ 
+       * nsterm.m (ns_in_resize): Remove (Bug#12479).
+       (ns_resize_handle_rect, mouseDown, mouseUp, mouseDragged): Remove.
+       (ns_clear_frame, sendEvent, windowDidResize, drawRect:):
+       Remove ns_in_resize check.
+       (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.
+ 
 +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/alloc.c
Simple merge

diff --cc src/lisp.h
Simple merge

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

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32proc.c
Simple merge

diff --cc src/w32term.h
index 91723c3758afb073d0a18371e99c390ab97f0260,af5b37a11710024960a71be9e8e3e8cb69ae5c17..94ef9624351810b627364864a1b3873ceea33c75
--- 1/src/w32term.h
--- 2/src/w32term.h
+++ b/src/w32term.h
@@@ -682,13 -681,10 +682,17 @@@ extern BOOL parse_button (int, int, in
  
  extern void w32_sys_ring_bell (struct frame *f);
  extern void x_delete_display (struct w32_display_info *dpyinfo);
 -
++
 +extern int notification_buffer_in_use;
 +extern BYTE file_notifications[16384];
 +extern DWORD notifications_size;
 +extern void *notifications_desc;
 +extern Lisp_Object w32_get_watch_object (Lisp_Object);
 +extern Lisp_Object lispy_file_action (DWORD);
 +
+ extern void w32_initialize_display_info (Lisp_Object);
+ extern void initialize_w32_display (struct terminal *);
+ 
  /* Keypad command key support.  W32 doesn't have virtual keys defined
     for the function keys on the keypad (they are mapped to the standard
     function keys), so we define our own.  */