diff options
| author | Erik Naggum | 1996-01-09 00:32:53 +0000 |
|---|---|---|
| committer | Erik Naggum | 1996-01-09 00:32:53 +0000 |
| commit | e57d8fd80f28c40b3aa4f8a2b1270c6cfc0b0c02 (patch) | |
| tree | 68e3a1152a4c8b18a904bdc0d2425dbb37a19b3f /src | |
| parent | 04c9843223efdb067639abd19dd881cbc4a14d3e (diff) | |
| download | emacs-e57d8fd80f28c40b3aa4f8a2b1270c6cfc0b0c02.tar.gz emacs-e57d8fd80f28c40b3aa4f8a2b1270c6cfc0b0c02.zip | |
(Fevent_convert_list, Fcommand_execute): Harmonize arguments with
documentation.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index f4f06ecff6f..0d6d7117e30 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -4082,21 +4082,21 @@ modify_event_symbol (symbol_num, modifiers, symbol_kind, name_alist, | |||
| 4082 | event type as a number or a symbol. */ | 4082 | event type as a number or a symbol. */ |
| 4083 | 4083 | ||
| 4084 | DEFUN ("event-convert-list", Fevent_convert_list, Sevent_convert_list, 1, 1, 0, | 4084 | DEFUN ("event-convert-list", Fevent_convert_list, Sevent_convert_list, 1, 1, 0, |
| 4085 | "Convert the event description LIST to an event type.\n\ | 4085 | "Convert the event description list EVENT-DESC to an event type.\n\ |
| 4086 | LIST should contain one base event type (a character or symbol)\n\ | 4086 | EVENT-DESC should contain one base event type (a character or symbol)\n\ |
| 4087 | and zero or more modifier names (control, meta, hyper, super, shift, alt,\n\ | 4087 | and zero or more modifier names (control, meta, hyper, super, shift, alt,\n\ |
| 4088 | drag, down, double or triple).\n\ | 4088 | drag, down, double or triple).\n\ |
| 4089 | The return value is an event type (a character or symbol) which\n\ | 4089 | The return value is an event type (a character or symbol) which\n\ |
| 4090 | has the same base event type and all the specified modifiers.") | 4090 | has the same base event type and all the specified modifiers.") |
| 4091 | (event) | 4091 | (event_desc) |
| 4092 | Lisp_Object event; | 4092 | Lisp_Object event_desc; |
| 4093 | { | 4093 | { |
| 4094 | Lisp_Object base; | 4094 | Lisp_Object base; |
| 4095 | int modifiers = 0; | 4095 | int modifiers = 0; |
| 4096 | Lisp_Object rest; | 4096 | Lisp_Object rest; |
| 4097 | 4097 | ||
| 4098 | base = Qnil; | 4098 | base = Qnil; |
| 4099 | rest = event; | 4099 | rest = event_desc; |
| 4100 | while (CONSP (rest)) | 4100 | while (CONSP (rest)) |
| 4101 | { | 4101 | { |
| 4102 | Lisp_Object elt; | 4102 | Lisp_Object elt; |
| @@ -6375,8 +6375,8 @@ means unconditionally put this command in `command-history'.\n\ | |||
| 6375 | Otherwise, that is done only if an arg is read using the minibuffer.\n\ | 6375 | Otherwise, that is done only if an arg is read using the minibuffer.\n\ |
| 6376 | The argument KEYS specifies the value to use instead of (this-command-keys)\n\ | 6376 | The argument KEYS specifies the value to use instead of (this-command-keys)\n\ |
| 6377 | when reading the arguments; if it is nil, (this_command_key_count) is used.") | 6377 | when reading the arguments; if it is nil, (this_command_key_count) is used.") |
| 6378 | (cmd, record, keys) | 6378 | (cmd, record_flag, keys) |
| 6379 | Lisp_Object cmd, record, keys; | 6379 | Lisp_Object cmd, record_flag, keys; |
| 6380 | { | 6380 | { |
| 6381 | register Lisp_Object final; | 6381 | register Lisp_Object final; |
| 6382 | register Lisp_Object tem; | 6382 | register Lisp_Object tem; |
| @@ -6415,7 +6415,7 @@ when reading the arguments; if it is nil, (this_command_key_count) is used.") | |||
| 6415 | /* If requested, place the macro in the command history. For | 6415 | /* If requested, place the macro in the command history. For |
| 6416 | other sorts of commands, call-interactively takes care of | 6416 | other sorts of commands, call-interactively takes care of |
| 6417 | this. */ | 6417 | this. */ |
| 6418 | if (!NILP (record)) | 6418 | if (!NILP (record_flag)) |
| 6419 | Vcommand_history | 6419 | Vcommand_history |
| 6420 | = Fcons (Fcons (Qexecute_kbd_macro, | 6420 | = Fcons (Fcons (Qexecute_kbd_macro, |
| 6421 | Fcons (final, Fcons (prefixarg, Qnil))), | 6421 | Fcons (final, Fcons (prefixarg, Qnil))), |
| @@ -6432,7 +6432,7 @@ when reading the arguments; if it is nil, (this_command_key_count) is used.") | |||
| 6432 | backtrace.nargs = 1; | 6432 | backtrace.nargs = 1; |
| 6433 | backtrace.evalargs = 0; | 6433 | backtrace.evalargs = 0; |
| 6434 | 6434 | ||
| 6435 | tem = Fcall_interactively (cmd, record, keys); | 6435 | tem = Fcall_interactively (cmd, record_flag, keys); |
| 6436 | 6436 | ||
| 6437 | backtrace_list = backtrace.next; | 6437 | backtrace_list = backtrace.next; |
| 6438 | return tem; | 6438 | return tem; |