 @@ -1,14 +1,14 @@
-/*   $NetBSD: ins_wch.c,v 1.11 2017/01/31 09:17:53 roy Exp $ */
+/*   $NetBSD: ins_wch.c,v 1.11.4.1 2020/07/07 12:48:42 martin Exp $ */
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
  * All rights reserved.
+ *
  * This code is derived from code donated to the NetBSD Foundation
  * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@gmail.com>.
+ *
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -26,27 +26,27 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ins_wch.c,v 1.11 2017/01/31 09:17:53 roy Exp $");
+__RCSID("$NetBSD: ins_wch.c,v 1.11.4.1 2020/07/07 12:48:42 martin Exp $");
 #endif						  /* not lint */
 #include <string.h>
 #include <stdlib.h>
 #include "curses.h"
 #include "curses_private.h"
 /*
  * ins_wch --
  *	Do an insert-char on the line, leaving (cury, curx) unchanged.
  */
 int
 @@ -76,27 +76,27 @@ mvins_wch(int y, int x, const cchar_t *w
 /*
  * mvwins_wch --
  *	  Do an insert-char on the line at (y, x) in the given window.
  */
 int
 mvwins_wch(WINDOW *win, int y, int x, const cchar_t *wch)
+{
 #ifndef HAVE_WCHAR
 	return ERR;
 #else
 	if (wmove(win, y, x) == ERR)
 		return ERR;
-	return wins_wch(stdscr, wch);
+	return wins_wch(win, wch);
 #endif /* HAVE_WCHAR */
+}
 /*
  * wins_wch --
  *	Do an insert-char on the line, leaving (cury, curx) unchanged.
  */
 int
 wins_wch(WINDOW *win, const cchar_t *wch)
+{
 #ifndef HAVE_WCHAR
 	return ERR;
 #else

 @@ -1,14 +1,14 @@
-/*   $NetBSD: ins_wstr.c,v 1.11 2017/01/31 09:17:53 roy Exp $ */
+/*   $NetBSD: ins_wstr.c,v 1.11.4.1 2020/07/07 12:48:42 martin Exp $ */
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
  * All rights reserved.
+ *
  * This code is derived from code donated to the NetBSD Foundation
  * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@gmail.com>.
+ *
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -26,27 +26,27 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ins_wstr.c,v 1.11 2017/01/31 09:17:53 roy Exp $");
+__RCSID("$NetBSD: ins_wstr.c,v 1.11.4.1 2020/07/07 12:48:42 martin Exp $");
 #endif						  /* not lint */
 #include <string.h>
 #include <stdlib.h>
 #include "curses.h"
 #include "curses_private.h"
 /*
  * ins_wstr --
  *	insert a multi-character wide-character string into the current window
  */
 int
 @@ -86,40 +86,40 @@ mvins_nwstr(int y, int x, const wchar_t
 	return mvwins_nwstr(stdscr, y, x, wstr, n);
+}
 /*
  * mvwins_wstr --
  *	  Do an insert-string on the line at (y, x) in the given window.
  */
 int
 mvwins_wstr(WINDOW *win, int y, int x, const wchar_t *wstr)
+{
 	if (wmove(win, y, x) == ERR)
 		return ERR;
-	return wins_wstr(stdscr, wstr);
+	return wins_wstr(win, wstr);
+}
 /*
  * mvwins_nwstr --
  *	  Do an insert-n-string on the line at (y, x) in the given window.
  */
 int
 mvwins_nwstr(WINDOW *win, int y, int x, const wchar_t *wstr, int n)
+{
 	if (wmove(win, y, x) == ERR)
 		return ERR;
-	return wins_nwstr(stdscr, wstr, n);
+	return wins_nwstr(win, wstr, n);
+}
 /*
  * wins_wstr --
  *	Do an insert-string on the line, leaving (cury, curx) unchanged.
  */
 int
 wins_wstr(WINDOW *win, const wchar_t *wstr)
+{
 	return wins_nwstr(win, wstr, -1);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: insch.c,v 1.23 2017/01/06 13:53:18 roy Exp $	*/
+/*	$NetBSD: insch.c,v 1.23.6.1 2020/07/07 12:48:42 martin Exp $	*/
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)insch.c	8.2 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: insch.c,v 1.23 2017/01/06 13:53:18 roy Exp $");
+__RCSID("$NetBSD: insch.c,v 1.23.6.1 2020/07/07 12:48:42 martin Exp $");
 #endif
 #endif				/* not lint */
 #include <string.h>
 #include <stdlib.h>
 #include "curses.h"
 #include "curses_private.h"
 #ifndef _CURSES_USE_MACROS
 /*
  * insch --
 @@ -69,27 +69,27 @@ mvinsch(int y, int x, chtype ch)
+}
 /*
  * mvwinsch --
  *	Do an insert-char on the line at (y, x) in the given window.
  */
 int
 mvwinsch(WINDOW *win, int y, int x, chtype ch)
+{
 	if (wmove(win, y, x) == ERR)
 		return ERR;
-	return winsch(stdscr, ch);
+	return winsch(win, ch);
+}
 #endif
 /*
  * winsch --
  *	Do an insert-char on the line, leaving (cury, curx) unchanged.
  */
 int
 winsch(WINDOW *win, chtype ch)
+{
 	__LDATA	*end, *temp1, *temp2;
 	attr_t attr;

 @@ -1,14 +1,14 @@
-/*   $NetBSD: insstr.c,v 1.5 2017/01/06 13:53:18 roy Exp $ */
+/*   $NetBSD: insstr.c,v 1.5.6.1 2020/07/07 12:48:42 martin Exp $ */
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
  * All rights reserved.
+ *
  * This code is derived from code donated to the NetBSD Foundation
  * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@gmail.com>.
+ *
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -26,27 +26,27 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: insstr.c,v 1.5 2017/01/06 13:53:18 roy Exp $");
+__RCSID("$NetBSD: insstr.c,v 1.5.6.1 2020/07/07 12:48:42 martin Exp $");
 #endif						  /* not lint */
 #include <string.h>
 #include <stdlib.h>
 #include "curses.h"
 #include "curses_private.h"
 #ifndef _CURSES_USE_MACROS
 /*
  * insstr --
  *	insert a multi-byte character string into the current window
 @@ -93,41 +93,41 @@ mvinsnstr(int y, int x, const char *str,
+}
 /*
  * mvwinsstr --
  *	  Do an insert-string on the line at (y, x) in the given window.
  */
 int
 mvwinsstr(WINDOW *win, int y, int x, const char *str)
+{
 	if (wmove(win, y, x) == ERR)
 		return ERR;
-	return winsstr(stdscr, str);
+	return winsstr(win, str);
+}
 /*
  * mvwinsnstr --
  *	  Do an insert-n-string on the line at (y, x) in the given window.
  */
 int
 mvwinsnstr(WINDOW *win, int y, int x, const char *str, int n)
+{
 	if (wmove(win, y, x) == ERR)
 		return ERR;
-	return winsnstr(stdscr, str, n);
+	return winsnstr(win, str, n);
+}
 #endif
 /*
  * winsstr --
  *	Do an insert-string on the line, leaving (cury, curx) unchanged.
  *	No wrapping.
  */
 int
 winsstr(WINDOW *win, const char *str)
+{