Merge from trunk.

diff --cc lisp/ChangeLog
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
index 8316223cd286e423faa45c13994e5ff72c185115,61481c5f0f67231dc2f30cd15a2f9950f1940fe0..2a37e510ba49c0fd654641bb9c26ce0a33c4761b
--- 1/src/keyboard.c
--- 2/src/keyboard.c
+++ b/src/keyboard.c
@@@ -313,11 -313,8 +313,11 @@@ static Lisp_Object Qmouse_fixup_help_me
  /* Symbols to denote kinds of events.  */
  static Lisp_Object Qfunction_key;
  Lisp_Object Qmouse_click;
- #if defined (HAVE_NTGUI)
+ #ifdef HAVE_NTGUI
  Lisp_Object Qlanguage_change;
 +#ifdef WINDOWSNT
 +Lisp_Object Qfile_notify;
 +#endif
  #endif
  static Lisp_Object Qdrag_n_drop;
  static Lisp_Object Qsave_session;
@@@ -11407,9 -11394,8 +11407,9 @@@ syms_of_keyboard (void
    DEFSYM (Qconfig_changed_event, "config-changed-event");
    DEFSYM (Qmenu_enable, "menu-enable");
  
- #if defined (HAVE_NTGUI)
+ #ifdef HAVE_NTGUI
    DEFSYM (Qlanguage_change, "language-change");
 +  DEFSYM (Qfile_notify, "file-notify");
  #endif
  
  #ifdef HAVE_DBUS

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

diff --cc src/termhooks.h
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32term.c
Simple merge