HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk
[bpt/emacs.git]
/
src
/
keyboard.c
diff --git
a/src/keyboard.c
b/src/keyboard.c
index
01644b3
..
451ffd9
100644
(file)
--- a/
src/keyboard.c
+++ b/
src/keyboard.c
@@
-315,7
+315,7
@@
static Lisp_Object Qmouse_fixup_help_message;
/* Symbols to denote kinds of events. */
static Lisp_Object Qfunction_key;
Lisp_Object Qmouse_click;
/* Symbols to denote kinds of events. */
static Lisp_Object Qfunction_key;
Lisp_Object Qmouse_click;
-#if defined (
WINDOWSNT
)
+#if defined (
HAVE_NTGUI
)
Lisp_Object Qlanguage_change;
#endif
static Lisp_Object Qdrag_n_drop;
Lisp_Object Qlanguage_change;
#endif
static Lisp_Object Qdrag_n_drop;
@@
-3790,8
+3790,8
@@
kbd_buffer_get_event (KBOARD **kbp,
#ifdef subprocesses
if (kbd_on_hold_p () && kbd_buffer_nr_stored () < KBD_BUFFER_SIZE/4)
{
#ifdef subprocesses
if (kbd_on_hold_p () && kbd_buffer_nr_stored () < KBD_BUFFER_SIZE/4)
{
- /* Start reading input again
, we have processed enough so we can
- accept new events again. */
+ /* Start reading input again
because we have processed enough to
+
be able to
accept new events again. */
unhold_keyboard_input ();
#ifdef USABLE_SIGIO
if (!noninteractive)
unhold_keyboard_input ();
#ifdef USABLE_SIGIO
if (!noninteractive)
@@
-3980,7
+3980,7
@@
kbd_buffer_get_event (KBOARD **kbp,
x_activate_menubar (XFRAME (event->frame_or_window));
}
#endif
x_activate_menubar (XFRAME (event->frame_or_window));
}
#endif
-#if defined (
WINDOWSNT
)
+#if defined (
HAVE_NTGUI
)
else if (event->kind == LANGUAGE_CHANGE_EVENT)
{
/* Make an event (language-change (FRAME CODEPAGE LANGUAGE-ID)). */
else if (event->kind == LANGUAGE_CHANGE_EVENT)
{
/* Make an event (language-change (FRAME CODEPAGE LANGUAGE-ID)). */
@@
-5435,7
+5435,7
@@
make_lispy_event (struct input_event *event)
(sizeof (lispy_function_keys)
/ sizeof (lispy_function_keys[0])));
(sizeof (lispy_function_keys)
/ sizeof (lispy_function_keys[0])));
-#ifdef
WINDOWSNT
+#ifdef
HAVE_NTGUI
case MULTIMEDIA_KEY_EVENT:
if (event->code < (sizeof (lispy_multimedia_keys)
/ sizeof (lispy_multimedia_keys[0]))
case MULTIMEDIA_KEY_EVENT:
if (event->code < (sizeof (lispy_multimedia_keys)
/ sizeof (lispy_multimedia_keys[0]))
@@
-11455,7
+11455,7
@@
syms_of_keyboard (void)
DEFSYM (Qconfig_changed_event, "config-changed-event");
DEFSYM (Qmenu_enable, "menu-enable");
DEFSYM (Qconfig_changed_event, "config-changed-event");
DEFSYM (Qmenu_enable, "menu-enable");
-#if defined (
WINDOWSNT
)
+#if defined (
HAVE_NTGUI
)
DEFSYM (Qlanguage_change, "language-change");
#endif
DEFSYM (Qlanguage_change, "language-change");
#endif