aboutsummaryrefslogtreecommitdiffstats
path: root/src/termhooks.h
diff options
context:
space:
mode:
authorEli Zaretskii2012-10-09 20:28:06 +0200
committerEli Zaretskii2012-10-09 20:28:06 +0200
commitb97f22cdad55a0964758cef3a19ce3fa1098657d (patch)
tree8d078a5b2aab3f55708a5f8eeaf8ca0f022e6ee3 /src/termhooks.h
parent87c141ce9750881f6203148e3c49d00710cd472e (diff)
parentb15736e6e33a52021a2a91b0b3360cd5a9803405 (diff)
downloademacs-b97f22cdad55a0964758cef3a19ce3fa1098657d.tar.gz
emacs-b97f22cdad55a0964758cef3a19ce3fa1098657d.zip
Merge from trunk.
Diffstat (limited to 'src/termhooks.h')
-rw-r--r--src/termhooks.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/termhooks.h b/src/termhooks.h
index 285a1824ecb..bac86423a4b 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -107,7 +107,7 @@ enum event_kind
107 HORIZ_WHEEL_EVENT, /* A wheel event generated by a second 107 HORIZ_WHEEL_EVENT, /* A wheel event generated by a second
108 horizontal wheel that is present on some 108 horizontal wheel that is present on some
109 mice. See WHEEL_EVENT. */ 109 mice. See WHEEL_EVENT. */
110#if defined (HAVE_NTGUI) 110#ifdef HAVE_NTGUI
111 LANGUAGE_CHANGE_EVENT, /* A LANGUAGE_CHANGE_EVENT is 111 LANGUAGE_CHANGE_EVENT, /* A LANGUAGE_CHANGE_EVENT is
112 generated when HAVE_NTGUI or on Mac OS 112 generated when HAVE_NTGUI or on Mac OS
113 when the keyboard layout or input 113 when the keyboard layout or input