aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2010-11-20 13:45:14 +0200
committerEli Zaretskii2010-11-20 13:45:14 +0200
commit6ce950f336909aa19d6c5ea6f3e1910b247f3d38 (patch)
tree56a68654196bd73ccb42480cf4311b804164fde2 /src
parent614316a70089e6a78a7ab1af36d7376926b15f64 (diff)
parentd9a95e676752a131a373d2341146a3f13add0dbd (diff)
downloademacs-6ce950f336909aa19d6c5ea6f3e1910b247f3d38.tar.gz
emacs-6ce950f336909aa19d6c5ea6f3e1910b247f3d38.zip
msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the same in-line.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/msdos.c13
2 files changed, 7 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index dfb1b99ef00..b7c1ef2c93c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-11-20 Eli Zaretskii <eliz@gnu.org>
2
3 * msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the
4 same in-line.
5
12010-11-20 Andreas Schwab <schwab@linux-m68k.org> 62010-11-20 Andreas Schwab <schwab@linux-m68k.org>
2 7
3 * xfaces.c (lookup_face): Make static. 8 * xfaces.c (lookup_face): Make static.
diff --git a/src/msdos.c b/src/msdos.c
index 964fde0cbf5..0f9a2ff29e5 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -2725,17 +2725,8 @@ dos_rawgetc (void)
2725 /* If the contents of the global variable help_echo has 2725 /* If the contents of the global variable help_echo has
2726 changed, generate a HELP_EVENT. */ 2726 changed, generate a HELP_EVENT. */
2727 if (!NILP (help_echo_string) || !NILP (previous_help_echo_string)) 2727 if (!NILP (help_echo_string) || !NILP (previous_help_echo_string))
2728 { 2728 gen_help_event (help_echo_string, selected_frame, help_echo_window,
2729 event.kind = HELP_EVENT; 2729 help_echo_object, help_echo_pos);
2730 event.frame_or_window = selected_frame;
2731 event.arg = help_echo_object;
2732 event.x = WINDOWP (help_echo_window)
2733 ? help_echo_window : selected_frame;
2734 event.y = help_echo_string;
2735 event.timestamp = event_timestamp ();
2736 event.code = help_echo_pos;
2737 kbd_buffer_store_event (&event);
2738 }
2739 } 2730 }
2740 2731
2741 for (but = 0; but < NUM_MOUSE_BUTTONS; but++) 2732 for (but = 0; but < NUM_MOUSE_BUTTONS; but++)