Module Name: src
Committed By: bouyer
Date: Sun Nov 15 20:47:11 UTC 2015
Modified Files:
src/lib/libcurses [netbsd-6]: toucholap.c
Log Message:
Pull up following revision(s) (requested by uwe in ticket #1337):
lib/libcurses/toucholap.c: revision 1.16
Fix x/y edito.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.36.1 src/lib/libcurses/toucholap.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/toucholap.c
diff -u src/lib/libcurses/toucholap.c:1.15 src/lib/libcurses/toucholap.c:1.15.36.1
--- src/lib/libcurses/toucholap.c:1.15 Sun Jan 21 13:25:36 2007
+++ src/lib/libcurses/toucholap.c Sun Nov 15 20:47:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: toucholap.c,v 1.15 2007/01/21 13:25:36 jdc Exp $ */
+/* $NetBSD: toucholap.c,v 1.15.36.1 2015/11/15 20:47:11 bouyer Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)toucholap.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: toucholap.c,v 1.15 2007/01/21 13:25:36 jdc Exp $");
+__RCSID("$NetBSD: toucholap.c,v 1.15.36.1 2015/11/15 20:47:11 bouyer Exp $");
#endif
#endif /* not lint */
@@ -55,7 +55,7 @@ touchoverlap(WINDOW *win1, WINDOW *win2)
#endif
starty = max(win1->begy, win2->begy);
startx = max(win1->begx, win2->begx);
- endy = min(win1->maxy + win1->begy, win2->maxy + win2->begx);
+ endy = min(win1->maxy + win1->begy, win2->maxy + win2->begy);
endx = min(win1->maxx + win1->begx, win2->maxx + win2->begx);
#ifdef DEBUG
__CTRACE(__CTRACE_WINDOW, "touchoverlap: from (%d,%d) to (%d,%d)\n",
