diff options
| author | Richard M. Stallman | 1993-03-07 23:43:52 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-03-07 23:43:52 +0000 |
| commit | 497ba7a108c7252ff6ea1667109066f66a52881a (patch) | |
| tree | 25120be2e5f4c78bd30db2b76403776f67c6b50c /src | |
| parent | 188d4d111de08e375dc28e7d105457116dd1d65e (diff) | |
| download | emacs-497ba7a108c7252ff6ea1667109066f66a52881a.tar.gz emacs-497ba7a108c7252ff6ea1667109066f66a52881a.zip | |
Include intervals.h.
(read_key_sequence): Use get_local_map.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 6c664169f03..a222a026723 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -35,6 +35,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |||
| 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 | ||
| @@ -3223,7 +3224,11 @@ read_key_sequence (keybuf, bufsize, prompt) | |||
| 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 | ||