Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libcurses/border.c,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libcurses/border.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.14
retrieving revision 1.14.12.1
diff -u -p -r1.14 -r1.14.12.1
--- src/lib/libcurses/border.c	2010/12/25 09:59:52	1.14
+++ src/lib/libcurses/border.c	2013/06/23 06:21:06	1.14.12.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: border.c,v 1.14 2010/12/25 09:59:52 blymn Exp $	*/
+/*	$NetBSD: border.c,v 1.14.12.1 2013/06/23 06:21:06 tls Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: border.c,v 1.14 2010/12/25 09:59:52 blymn Exp $");
+__RCSID("$NetBSD: border.c,v 1.14.12.1 2013/06/23 06:21:06 tls Exp $");
 #endif				/* not lint */
 
 #include <stdlib.h>
@@ -261,20 +261,36 @@ int wborder_set(WINDOW *win, const cchar
 	/* Merge window attributes */
 	left.attributes |= (left.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	left.attributes |= (left.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	right.attributes |= (right.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	right.attributes |= (right.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	top.attributes |= (top.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	top.attributes |= (top.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	bottom.attributes |= (bottom.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	bottom.attributes |= (bottom.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	topleft.attributes |= (topleft.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	topleft.attributes |= (topleft.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	topright.attributes |= (topright.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	topright.attributes |= (topright.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	botleft.attributes |= (botleft.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	botleft.attributes |= (botleft.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	botright.attributes |= (botright.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	botright.attributes |= (botright.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 
 	endx = win->maxx - 1;
 	endy = win->maxy - 1;