From e8b937f06bb4a88d68e96c81f63ead20892ea9b8 Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Tue, 10 Jul 2012 09:47:21 -0400 Subject: Readline-6.2 patch 3 --- input.c | 12 ++++++++---- patchlevel | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/input.c b/input.c index 7c74c99..b49af88 100644 --- a/input.c +++ b/input.c @@ -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) (); diff --git a/patchlevel b/patchlevel index 7cbda82..ce3e355 100644 --- a/patchlevel +++ b/patchlevel @@ -1,3 +1,3 @@ # Do not edit -- exists only for use by patch -2 +3 -- cgit v1.2.1