diff options
| author | Eli Zaretskii | 2010-11-20 13:24:28 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-11-20 13:24:28 +0200 |
| commit | d9a95e676752a131a373d2341146a3f13add0dbd (patch) | |
| tree | 4a5ef11b66193f2385aafa5c170e70c35b9faa11 /src | |
| parent | 059b2b00fb82f5ba6dc8dcca2e4a6aa6e5c82692 (diff) | |
| download | emacs-d9a95e676752a131a373d2341146a3f13add0dbd.tar.gz emacs-d9a95e676752a131a373d2341146a3f13add0dbd.zip | |
msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the same in-line.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/msdos.c | 13 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 902570f804f..ae622eaac28 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-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 | |||
| 1 | 2010-11-11 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2010-11-11 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * cmds.c (Fself_insert_command): Don't call XFASTINT without checking | 8 | * cmds.c (Fself_insert_command): Don't call XFASTINT without checking |
diff --git a/src/msdos.c b/src/msdos.c index 6593714ba1f..2f729904713 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++) |