diff options
| author | Kim F. Storm | 2002-02-20 23:01:48 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2002-02-20 23:01:48 +0000 |
| commit | 15fdc2e38b2a87a1a454c2e258faaa7a6bff6bc8 (patch) | |
| tree | 246bc54f4b9e18708bd7850c4381e6c52bdbe5bc /src | |
| parent | 52254d1aee4480e556ab732d18dacf3023865739 (diff) | |
| download | emacs-15fdc2e38b2a87a1a454c2e258faaa7a6bff6bc8.tar.gz emacs-15fdc2e38b2a87a1a454c2e258faaa7a6bff6bc8.zip | |
(kbd_buffer_get_event) [WINDOWSNT]: Corrected
composing of language-change event.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/keyboard.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c3ba2dedef7..04348f4fe19 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2002-02-20 Kim F. Storm <storm@cua.dk> | 1 | 2002-02-20 Kim F. Storm <storm@cua.dk> |
| 2 | 2 | ||
| 3 | * keyboard.c (kbd_buffer_get_event) [WINDOWSNT]: Corrected | ||
| 4 | composing of language-change event. | ||
| 5 | |||
| 6 | 2002-02-20 Kim F. Storm <storm@cua.dk> | ||
| 7 | |||
| 3 | * keyboard.c (menu_bar_items): Don't include keymap or local-map | 8 | * keyboard.c (menu_bar_items): Don't include keymap or local-map |
| 4 | bindings at PT when building menu (the menu is not updated often | 9 | bindings at PT when building menu (the menu is not updated often |
| 5 | enough for this to work reliable). | 10 | enough for this to work reliable). |
diff --git a/src/keyboard.c b/src/keyboard.c index 1ea807618d2..dcb11d75c28 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -3721,7 +3721,7 @@ kbd_buffer_get_event (kbp, used_mouse_menu) | |||
| 3721 | { | 3721 | { |
| 3722 | /* Make an event (language-change (FRAME CHARSET LCID)). */ | 3722 | /* Make an event (language-change (FRAME CHARSET LCID)). */ |
| 3723 | obj = Fcons (event->modifiers, Qnil); | 3723 | obj = Fcons (event->modifiers, Qnil); |
| 3724 | obj = Fcons (event->code, Qnil); | 3724 | obj = Fcons (event->code, obj); |
| 3725 | obj = Fcons (event->frame_or_window, obj); | 3725 | obj = Fcons (event->frame_or_window, obj); |
| 3726 | obj = Fcons (Qlanguage_change, Fcons (obj, Qnil)); | 3726 | obj = Fcons (Qlanguage_change, Fcons (obj, Qnil)); |
| 3727 | kbd_fetch_ptr = event + 1; | 3727 | kbd_fetch_ptr = event + 1; |