From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 9 Oct 2012 18:28:06 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2~7^2~670
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b97f22cdad55a0964758cef3a19ce3fa1098657d;p=emacs.git

Merge from trunk.
---

b97f22cdad55a0964758cef3a19ce3fa1098657d
diff --cc src/keyboard.c
index 8316223cd28,61481c5f0f6..2a37e510ba4
--- a/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