diff options
| author | Richard M. Stallman <rms@gnu.org> | 1997-07-04 20:44:52 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1997-07-04 20:44:52 +0000 |
| commit | 2e34157cd9e74150e79e0ce23236252b47fb5f1a (patch) | |
| tree | 418451da8380ec73d5d46dc648c07e6ad8af845f /src/keymap.c | |
| parent | 8c239ac3ed4f636810bc08959e1318b1a6e928ba (diff) | |
| download | emacs-2e34157cd9e74150e79e0ce23236252b47fb5f1a.tar.gz emacs-2e34157cd9e74150e79e0ce23236252b47fb5f1a.tar.bz2 emacs-2e34157cd9e74150e79e0ce23236252b47fb5f1a.zip | |
Fix bugs with inappropriate mixing of Lisp_Object with int.
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/keymap.c b/src/keymap.c index ef7e90df53a..5d18cf9349d 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -538,8 +538,7 @@ get_keyelt (object, autoload) key = Fcdr (object); if (INTEGERP (key) && (XINT (key) & meta_modifier)) { - object = access_keymap (map, make_number (meta_prefix_char), - 0, 0); + object = access_keymap (map, meta_prefix_char, 0, 0); map = get_keymap_1 (object, 0, autoload); object = access_keymap (map, make_number (XINT (key) & ~meta_modifier), @@ -1515,8 +1514,8 @@ then the value includes only maps for prefixes that start with PREFIX.") element = thisseq; tem = Fvconcat (1, &element); - XVECTOR (tem)->contents[XINT (last)] - = XINT (elt) | meta_modifier; + XSETFASTINT (XVECTOR (tem)->contents[XINT (last)], + XINT (elt) | meta_modifier); /* This new sequence is the same length as thisseq, so stick it in the list right @@ -2746,7 +2745,7 @@ describe_vector (vector, elt_prefix, elt_describer, int starting_i; if (indices == 0) - indices = (Lisp_Object *) alloca (3 * sizeof (Lisp_Object)); + indices = (int *) alloca (3 * sizeof (int)); definition = Qnil; |