Lisp_Object prompt, inherit_input_method, seconds;
{
Lisp_Object val;
- int c;
if (! NILP (prompt))
message_with_string ("%s", prompt, 0);
val = read_filtered_event (1, 1, 1, ! NILP (inherit_input_method), seconds);
- c = XINT (val);
- return make_number (char_resolve_modifier_mask (c));
+
+ return (NILP (val) ? Qnil
+ : make_number (char_resolve_modifier_mask (XINT (val))));
}
DEFUN ("read-event", Fread_event, Sread_event, 0, 3, 0,
Lisp_Object prompt, inherit_input_method, seconds;
{
Lisp_Object val;
- int c;
if (! NILP (prompt))
message_with_string ("%s", prompt, 0);
+
val = read_filtered_event (1, 1, 0, ! NILP (inherit_input_method), seconds);
- c = XINT (val);
- return make_number (char_resolve_modifier_mask (c));
+
+ return (NILP (val) ? Qnil
+ : make_number (char_resolve_modifier_mask (XINT (val))));
}
DEFUN ("get-file-char", Fget_file_char, Sget_file_char, 0, 0, 0,
2000-09-21: It's not possible to just check for the file loaded
being a member of Vloads_in_progress. This fails because of the
way the byte compiler currently works; `provide's are not
- evaluted, see font-lock.el/jit-lock.el as an example. This
+ evaluated, see font-lock.el/jit-lock.el as an example. This
leads to a certain amount of ``normal'' recursion.
Also, just loading a file recursively is not always an error in