diff options
| author | Joakim Verona | 2013-02-12 00:04:05 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-02-12 00:04:05 +0100 |
| commit | e0444a0966fa001953bb97cfb60451c42220be8e (patch) | |
| tree | d5d10a2f99fa0c7b24eee310069e2677409e6802 /src/lread.c | |
| parent | 77f4834db1299b571b1fb3dfb120e5e50eec7cb1 (diff) | |
| parent | 6659b59ccb7909a07f71a0143fd9d85e60b8e414 (diff) | |
| download | emacs-e0444a0966fa001953bb97cfb60451c42220be8e.tar.gz emacs-e0444a0966fa001953bb97cfb60451c42220be8e.zip | |
auto upstream
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lread.c b/src/lread.c index c62c62a5e5a..e7af86aa664 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -614,17 +614,17 @@ read_filtered_event (bool no_switch_frame, bool ascii_required, | |||
| 614 | end_time = add_emacs_time (current_emacs_time (), wait_time); | 614 | end_time = add_emacs_time (current_emacs_time (), wait_time); |
| 615 | } | 615 | } |
| 616 | 616 | ||
| 617 | /* Read until we get an acceptable event. */ | 617 | /* Read until we get an acceptable event. */ |
| 618 | retry: | 618 | retry: |
| 619 | do | 619 | do |
| 620 | val = read_char (0, 0, 0, (input_method ? Qnil : Qt), 0, | 620 | val = read_char (0, Qnil, (input_method ? Qnil : Qt), 0, |
| 621 | NUMBERP (seconds) ? &end_time : NULL); | 621 | NUMBERP (seconds) ? &end_time : NULL); |
| 622 | while (INTEGERP (val) && XINT (val) == -2); /* wrong_kboard_jmpbuf */ | 622 | while (INTEGERP (val) && XINT (val) == -2); /* wrong_kboard_jmpbuf */ |
| 623 | 623 | ||
| 624 | if (BUFFERP (val)) | 624 | if (BUFFERP (val)) |
| 625 | goto retry; | 625 | goto retry; |
| 626 | 626 | ||
| 627 | /* switch-frame events are put off until after the next ASCII | 627 | /* `switch-frame' events are put off until after the next ASCII |
| 628 | character. This is better than signaling an error just because | 628 | character. This is better than signaling an error just because |
| 629 | the last characters were typed to a separate minibuffer frame, | 629 | the last characters were typed to a separate minibuffer frame, |
| 630 | for example. Eventually, some code which can deal with | 630 | for example. Eventually, some code which can deal with |