diff options
| author | Eli Zaretskii | 2012-07-21 17:11:33 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-07-21 17:11:33 +0300 |
| commit | 07fb592eadf294f0cc97ebf4de0afd4b02815faf (patch) | |
| tree | a9225adbc38d21dc1bfed97e53c01bf6bb9e7eff | |
| parent | 2d5c5f7da98d15665efe83a078dbb45520d003af (diff) | |
| download | emacs-07fb592eadf294f0cc97ebf4de0afd4b02815faf.tar.gz emacs-07fb592eadf294f0cc97ebf4de0afd4b02815faf.zip | |
Bind language-change in special-event-map.
src/keyboard.c (keys_of_keyboard): Bind language-change to 'ignore'
in special-event-map. See the discussion at
http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00417.html
for the reasons.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/keyboard.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e120edab056..5f75c69b96a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2012-07-21 Eli Zaretskii <eliz@gnu.org> | 1 | 2012-07-21 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * keyboard.c (keys_of_keyboard): Bind language-change to 'ignore' | ||
| 4 | in special-event-map. See the discussion at | ||
| 5 | http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00417.html | ||
| 6 | for the reasons. | ||
| 7 | |||
| 3 | * w32menu.c (add_menu_item): Cast to UINT_PTR when assigning | 8 | * w32menu.c (add_menu_item): Cast to UINT_PTR when assigning |
| 4 | info.dwItemData. Fixes crashes on 64-bit Windows. Suggested by | 9 | info.dwItemData. Fixes crashes on 64-bit Windows. Suggested by |
| 5 | Fabrice Popineau <fabrice.popineau@supelec.fr>. | 10 | Fabrice Popineau <fabrice.popineau@supelec.fr>. |
diff --git a/src/keyboard.c b/src/keyboard.c index 5e6dca64a92..0c03a2143d8 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -12232,6 +12232,10 @@ keys_of_keyboard (void) | |||
| 12232 | 12232 | ||
| 12233 | initial_define_lispy_key (Vspecial_event_map, "config-changed-event", | 12233 | initial_define_lispy_key (Vspecial_event_map, "config-changed-event", |
| 12234 | "ignore"); | 12234 | "ignore"); |
| 12235 | #if defined (WINDOWSNT) | ||
| 12236 | initial_define_lispy_key (Vspecial_event_map, "language-change", | ||
| 12237 | "ignore"); | ||
| 12238 | #endif | ||
| 12235 | } | 12239 | } |
| 12236 | 12240 | ||
| 12237 | /* Mark the pointers in the kboard objects. | 12241 | /* Mark the pointers in the kboard objects. |