Commit 497ba7a1 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

Include intervals.h.

(read_key_sequence): Use get_local_map.
parent 188d4d11
...@@ -35,6 +35,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -35,6 +35,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "disptab.h" #include "disptab.h"
#include "dispextern.h" #include "dispextern.h"
#include "keyboard.h" #include "keyboard.h"
#include "intervals.h"
#include <setjmp.h> #include <setjmp.h>
#include <errno.h> #include <errno.h>
...@@ -3223,7 +3224,11 @@ read_key_sequence (keybuf, bufsize, prompt) ...@@ -3223,7 +3224,11 @@ read_key_sequence (keybuf, bufsize, prompt)
nmaps_allocated = nmaps; nmaps_allocated = nmaps;
} }
bcopy (maps, submaps, (nmaps - 2) * sizeof (submaps[0])); bcopy (maps, submaps, (nmaps - 2) * sizeof (submaps[0]));
submaps[nmaps-2] = current_buffer->keymap; #ifdef USE_TEXT_PROPERTIES
submaps[nmaps-2] = get_local_map (PT, current_buffer);
#else
submaps[nmaps-2] = current_buffer->local_map;
#endif
submaps[nmaps-1] = global_map; submaps[nmaps-1] = global_map;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment