Module Name: src
Committed By: martin
Date: Wed Aug 8 10:32:18 UTC 2018
Modified Files:
src/lib/libcurses [netbsd-8]: addbytes.c
Log Message:
Pull up following revision(s) (requested by simonb in ticket #964):
lib/libcurses/addbytes.c: revision 1.48
Avoid curx going beyond end of window when adding a wide character to the
last column.
OK @blymn.
- --
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.47.6.1 src/lib/libcurses/addbytes.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/addbytes.c
diff -u src/lib/libcurses/addbytes.c:1.47 src/lib/libcurses/addbytes.c:1.47.6.1
--- src/lib/libcurses/addbytes.c:1.47 Fri Jan 6 14:25:41 2017
+++ src/lib/libcurses/addbytes.c Wed Aug 8 10:32:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: addbytes.c,v 1.47 2017/01/06 14:25:41 roy Exp $ */
+/* $NetBSD: addbytes.c,v 1.47.6.1 2018/08/08 10:32:18 martin Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addbytes.c 8.4 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addbytes.c,v 1.47 2017/01/06 14:25:41 roy Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.47.6.1 2018/08/08 10:32:18 martin Exp $");
#endif
#endif /* not lint */
@@ -582,7 +582,7 @@ _cursesi_addwchar(WINDOW *win, __LINE **
if (newx > *(*lnp)->lastchp)
*(*lnp)->lastchp = newx;
__touchline(win, *y, sx, (int) win->maxx - 1);
- win->curx = sx;
+ *x = win->curx = sx;
} else {
win->curx = *x;
