diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-06-04 21:58:43 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-06-04 21:58:43 -0400 |
| commit | bfa3acd65ba6e8cbaf66a4f3f61810ffba7b3fad (patch) | |
| tree | 230455c7f248de71d969ec07de0760dfa77f91d7 /src/doc.c | |
| parent | 2587b005f0f11913c2158fe8c81b18ebfc0beca8 (diff) | |
| download | emacs-bfa3acd65ba6e8cbaf66a4f3f61810ffba7b3fad.tar.gz emacs-bfa3acd65ba6e8cbaf66a4f3f61810ffba7b3fad.tar.bz2 emacs-bfa3acd65ba6e8cbaf66a4f3f61810ffba7b3fad.zip | |
* src/keymap.c (Fcurrent_active_maps, Fdescribe_buffer_bindings):
* src/keyboard.c (menu_bar_items, tool_bar_items):
* src/doc.c (Fsubstitute_command_keys): Voverriding_terminal_local_map does
not override local keymaps any more.
Diffstat (limited to 'src/doc.c')
| -rw-r--r-- | src/doc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/doc.c b/src/doc.c index e45481944f0..155a9891303 100644 --- a/src/doc.c +++ b/src/doc.c @@ -758,9 +758,7 @@ Otherwise, return a new string, without any text properties. */) or a specified local map (which means search just that and the global map). If non-nil, it might come from Voverriding_local_map, or from a \\<mapname> construct in STRING itself.. */ - keymap = KVAR (current_kboard, Voverriding_terminal_local_map); - if (NILP (keymap)) - keymap = Voverriding_local_map; + keymap = Voverriding_local_map; bsize = SBYTES (string); bufp = buf = xmalloc (bsize); |