Vendor import NetBSD's libedit of "2010/08/04 20:29:18 UTC".vendor/NetBSD/libedit/2010-08-04

Obtained from:	NetBSD

3 files changed, 19 insertions, 7 deletions

diff --git a/read.c b/read.c
index 1a59fcdad704..4a51799c1e64 100644
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: read.c,v 1.55 2010/03/22 22:59:06 christos Exp $	*/
+/*	$NetBSD: read.c,v 1.57 2010/07/21 18:18:52 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: read.c,v 1.55 2010/03/22 22:59:06 christos Exp $");
+__RCSID("$NetBSD: read.c,v 1.57 2010/07/21 18:18:52 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -321,10 +321,15 @@ read_char(EditLine *el, Char *cp)
  again:
 	el->el_signal->sig_no = 0;
 	while ((num_read = read(el->el_infd, cbuf + cbp, 1)) == -1) {
-		if (el->el_signal->sig_no == SIGCONT) {
-			sig_set(el);
+		switch (el->el_signal->sig_no) {
+		case SIGCONT:
 			el_set(el, EL_REFRESH);
+			/*FALLTHROUGH*/
+		case SIGWINCH:
+			sig_set(el);
 			goto again;
+		default:
+			break;
 		}
 		if (!tried && read__fixio(el->el_infd, errno) == 0)
 			tried = 1;
diff --git a/readline.c b/readline.c
index a0a390cc61f1..2f8afabec7ee 100644
--- a/readline.c
+++ b/readline.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: readline.c,v 1.89 2010/04/15 00:57:33 christos Exp $	*/
+/*	$NetBSD: readline.c,v 1.90 2010/08/04 20:29:18 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.89 2010/04/15 00:57:33 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.90 2010/08/04 20:29:18 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include <sys/types.h>
@@ -2234,3 +2234,9 @@ void
 rl_cleanup_after_signal(void)
 {
 }
+
+int
+rl_on_new_line(void)
+{
+	return 0;
+}
diff --git a/readline/readline.h b/readline/readline.h
index c4a5aa10be0a..db16ecc91101 100644
--- a/readline/readline.h
+++ b/readline/readline.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: readline.h,v 1.30 2009/09/07 21:24:34 christos Exp $	*/
+/*	$NetBSD: readline.h,v 1.31 2010/08/04 20:29:18 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -202,6 +202,7 @@ int		 _rl_qsort_string_compare(char **, char **);
 char 	       **rl_completion_matches(const char *, rl_compentry_func_t *);
 void		 rl_forced_update_display(void);
 int		 rl_set_prompt(const char *);
+int		 rl_on_new_line(void);
 
 /*
  * The following are not implemented