diff options
author | Chet Ramey <chet.ramey@case.edu> | 2012-07-10 09:47:21 -0400 |
---|---|---|
committer | Chet Ramey <chet.ramey@case.edu> | 2012-07-10 09:47:21 -0400 |
commit | e8b937f06bb4a88d68e96c81f63ead20892ea9b8 (patch) | |
tree | f4ebf89578acae7bcc13d527f3130d542ba606fa | |
parent | 37cc44fafc8006e15221ddc6c06be546dda2e6fe (diff) | |
download | readline-e8b937f06bb4a88d68e96c81f63ead20892ea9b8.tar.gz |
Readline-6.2 patch 3
-rw-r--r-- | input.c | 12 | ||||
-rw-r--r-- | patchlevel | 2 |
2 files changed, 9 insertions, 5 deletions
@@ -409,7 +409,7 @@ rl_clear_pending_input () int rl_read_key () { - int c; + int c, r; rl_key_sequence_length++; @@ -429,14 +429,18 @@ rl_read_key () { while (rl_event_hook) { - if (rl_gather_tyi () < 0) /* XXX - EIO */ + if (rl_get_char (&c) != 0) + break; + + if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */ { rl_done = 1; return ('\n'); } + else if (r == 1) /* read something */ + continue; + RL_CHECK_SIGNALS (); - if (rl_get_char (&c) != 0) - break; if (rl_done) /* XXX - experimental */ return ('\n'); (*rl_event_hook) (); @@ -1,3 +1,3 @@ # Do not edit -- exists only for use by patch -2 +3 |