Mercurial > emacs
changeset 97470:9a4bddae759e
(Fread_char, Fread_char_exclusive): If no character event is read
before timeout is reached, return nil, rather than converting to a
number.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 14 Aug 2008 19:24:54 +0000 |
| parents | 0a5d1005eed6 |
| children | 4a96c7aa164d |
| files | src/lread.c |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lread.c Thu Aug 14 19:24:36 2008 +0000 +++ b/src/lread.c Thu Aug 14 19:24:54 2008 +0000 @@ -791,13 +791,13 @@ 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, @@ -836,13 +836,14 @@ 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,