view src/readline-1-paste.patch @ 3980:9f7e9b053041

of-nan: add Nan 2.8.0 package * Makefile.in: add of-nan to OCTAVE_FORGE_PACKAGES * build_packages.m: add nan-2.8.0 install * dist-files.mk: add of-nan-1-cross-fixes.patch, of-nan.m * index.html: add of-nan package * of-nan.mk: new file * of-nan-1-cross-fixes.patch: new file
author John Donoghue
date Tue, 30 Jun 2015 13:41:41 -0400
parents 9e62095edc58
children
line wrap: on
line source

diff -u a/input.c b/readline-6.2/input.c
--- a/input.c	2010-05-30 18:33:01.000000000 -0400
+++ b/input.c	2012-06-25 21:08:42.000000000 -0400
@@ -410,5 +412,5 @@
 rl_read_key ()
 {
-  int c;
+  int c, r;
 
   rl_key_sequence_length++;
@@ -430,12 +432,16 @@
 	  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');