diff options
| author | Richard M. Stallman | 1997-07-12 06:42:03 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-07-12 06:42:03 +0000 |
| commit | c6a67acd8a9d46a1d11927c60be5a3e141b3964c (patch) | |
| tree | e18a3a671e64630d273b63e8ffebeb6cdd3e600b /src | |
| parent | 388017731f7ec4bca5f8f24921b9948e791f4b00 (diff) | |
| download | emacs-c6a67acd8a9d46a1d11927c60be5a3e141b3964c.tar.gz emacs-c6a67acd8a9d46a1d11927c60be5a3e141b3964c.zip | |
(command_loop_1): Add missing message2 argument.
(menu_bar_items): Add missing get_keyelt argument.
(follow_key): Likewise.
(read_key_sequence): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index edea093cd22..ea2fa336ac7 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -1148,7 +1148,7 @@ command_loop_1 () | |||
| 1148 | 1148 | ||
| 1149 | Fsit_for (make_number (2), Qnil, Qnil); | 1149 | Fsit_for (make_number (2), Qnil, Qnil); |
| 1150 | /* Clear the echo area. */ | 1150 | /* Clear the echo area. */ |
| 1151 | message2 (0); | 1151 | message2 (0, 0); |
| 1152 | safe_run_hooks (Qecho_area_clear_hook); | 1152 | safe_run_hooks (Qecho_area_clear_hook); |
| 1153 | 1153 | ||
| 1154 | unbind_to (count, Qnil); | 1154 | unbind_to (count, Qnil); |
| @@ -5182,7 +5182,7 @@ menu_bar_items (old) | |||
| 5182 | for (mapno = nmaps - 1; mapno >= 0; mapno--) | 5182 | for (mapno = nmaps - 1; mapno >= 0; mapno--) |
| 5183 | { | 5183 | { |
| 5184 | if (! NILP (maps[mapno])) | 5184 | if (! NILP (maps[mapno])) |
| 5185 | def = get_keyelt (access_keymap (maps[mapno], Qmenu_bar, 1, 0)); | 5185 | def = get_keyelt (access_keymap (maps[mapno], Qmenu_bar, 1, 0), 0); |
| 5186 | else | 5186 | else |
| 5187 | def = Qnil; | 5187 | def = Qnil; |
| 5188 | 5188 | ||
| @@ -5769,7 +5769,7 @@ follow_key (key, nmaps, current, defs, next) | |||
| 5769 | { | 5769 | { |
| 5770 | Lisp_Object def; | 5770 | Lisp_Object def; |
| 5771 | def = get_keyelt (access_keymap (current[i], | 5771 | def = get_keyelt (access_keymap (current[i], |
| 5772 | meta_prefix_char, 1, 0)); | 5772 | meta_prefix_char, 1, 0), 0); |
| 5773 | 5773 | ||
| 5774 | /* Note that since we pass the resulting bindings through | 5774 | /* Note that since we pass the resulting bindings through |
| 5775 | get_keymap_1, non-prefix bindings for meta-prefix-char | 5775 | get_keymap_1, non-prefix bindings for meta-prefix-char |
| @@ -5794,7 +5794,7 @@ follow_key (key, nmaps, current, defs, next) | |||
| 5794 | else | 5794 | else |
| 5795 | map = current[i]; | 5795 | map = current[i]; |
| 5796 | 5796 | ||
| 5797 | defs[i] = get_keyelt (access_keymap (map, key, 1, 0)); | 5797 | defs[i] = get_keyelt (access_keymap (map, key, 1, 0), 0); |
| 5798 | if (! NILP (defs[i])) | 5798 | if (! NILP (defs[i])) |
| 5799 | first_binding = i; | 5799 | first_binding = i; |
| 5800 | } | 5800 | } |
| @@ -6546,7 +6546,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last, | |||
| 6546 | fkey_next | 6546 | fkey_next |
| 6547 | = get_keymap_1 | 6547 | = get_keymap_1 |
| 6548 | (get_keyelt | 6548 | (get_keyelt |
| 6549 | (access_keymap (fkey_map, meta_prefix_char, 1, 0)), | 6549 | (access_keymap (fkey_map, meta_prefix_char, 1, 0), 0), |
| 6550 | 0, 1); | 6550 | 0, 1); |
| 6551 | XSETFASTINT (key, XFASTINT (key) & ~meta_modifier); | 6551 | XSETFASTINT (key, XFASTINT (key) & ~meta_modifier); |
| 6552 | } | 6552 | } |
| @@ -6554,7 +6554,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last, | |||
| 6554 | fkey_next = fkey_map; | 6554 | fkey_next = fkey_map; |
| 6555 | 6555 | ||
| 6556 | fkey_next | 6556 | fkey_next |
| 6557 | = get_keyelt (access_keymap (fkey_next, key, 1, 0)); | 6557 | = get_keyelt (access_keymap (fkey_next, key, 1, 0), 0); |
| 6558 | 6558 | ||
| 6559 | #if 0 /* I didn't turn this on, because it might cause trouble | 6559 | #if 0 /* I didn't turn this on, because it might cause trouble |
| 6560 | for the mapping of return into C-m and tab into C-i. */ | 6560 | for the mapping of return into C-m and tab into C-i. */ |
| @@ -6654,7 +6654,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last, | |||
| 6654 | keytran_next | 6654 | keytran_next |
| 6655 | = get_keymap_1 | 6655 | = get_keymap_1 |
| 6656 | (get_keyelt | 6656 | (get_keyelt |
| 6657 | (access_keymap (keytran_map, meta_prefix_char, 1, 0)), | 6657 | (access_keymap (keytran_map, meta_prefix_char, 1, 0), 0), |
| 6658 | 0, 1); | 6658 | 0, 1); |
| 6659 | XSETFASTINT (key, XFASTINT (key) & ~meta_modifier); | 6659 | XSETFASTINT (key, XFASTINT (key) & ~meta_modifier); |
| 6660 | } | 6660 | } |
| @@ -6662,7 +6662,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last, | |||
| 6662 | keytran_next = keytran_map; | 6662 | keytran_next = keytran_map; |
| 6663 | 6663 | ||
| 6664 | keytran_next | 6664 | keytran_next |
| 6665 | = get_keyelt (access_keymap (keytran_next, key, 1, 0)); | 6665 | = get_keyelt (access_keymap (keytran_next, key, 1, 0), 0); |
| 6666 | 6666 | ||
| 6667 | /* If the key translation map gives a function, not an | 6667 | /* If the key translation map gives a function, not an |
| 6668 | array, then call the function with no args and use | 6668 | array, then call the function with no args and use |