Mercurial > emacs
comparison src/keyboard.c @ 2061:8fe7e77dc596
Include intervals.h.
(read_key_sequence): Use get_local_map.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 07 Mar 1993 23:43:52 +0000 |
parents | 0c95942fc8da |
children | dd4410e55081 |
comparison
equal
deleted
inserted
replaced
2060:7eea4dfc5133 | 2061:8fe7e77dc596 |
---|---|
33 #include "commands.h" | 33 #include "commands.h" |
34 #include "buffer.h" | 34 #include "buffer.h" |
35 #include "disptab.h" | 35 #include "disptab.h" |
36 #include "dispextern.h" | 36 #include "dispextern.h" |
37 #include "keyboard.h" | 37 #include "keyboard.h" |
38 #include "intervals.h" | |
38 #include <setjmp.h> | 39 #include <setjmp.h> |
39 #include <errno.h> | 40 #include <errno.h> |
40 | 41 |
41 #ifndef VMS | 42 #ifndef VMS |
42 #include <sys/ioctl.h> | 43 #include <sys/ioctl.h> |
3221 submaps = (Lisp_Object *) alloca (nmaps * sizeof (submaps[0])); | 3222 submaps = (Lisp_Object *) alloca (nmaps * sizeof (submaps[0])); |
3222 defs = (Lisp_Object *) alloca (nmaps * sizeof (defs[0])); | 3223 defs = (Lisp_Object *) alloca (nmaps * sizeof (defs[0])); |
3223 nmaps_allocated = nmaps; | 3224 nmaps_allocated = nmaps; |
3224 } | 3225 } |
3225 bcopy (maps, submaps, (nmaps - 2) * sizeof (submaps[0])); | 3226 bcopy (maps, submaps, (nmaps - 2) * sizeof (submaps[0])); |
3226 submaps[nmaps-2] = current_buffer->keymap; | 3227 #ifdef USE_TEXT_PROPERTIES |
3228 submaps[nmaps-2] = get_local_map (PT, current_buffer); | |
3229 #else | |
3230 submaps[nmaps-2] = current_buffer->local_map; | |
3231 #endif | |
3227 submaps[nmaps-1] = global_map; | 3232 submaps[nmaps-1] = global_map; |
3228 } | 3233 } |
3229 | 3234 |
3230 /* Find an accurate initial value for first_binding. */ | 3235 /* Find an accurate initial value for first_binding. */ |
3231 for (first_binding = 0; first_binding < nmaps; first_binding++) | 3236 for (first_binding = 0; first_binding < nmaps; first_binding++) |