Module Name:    src
Committed By:   uwe
Date:           Sun Nov 18 21:01:17 UTC 2018

Modified Files:
        src/lib/libcurses: background.c

Log Message:
wbkgd - do not duplicate the code that's already in wbkgdset()
that we do call anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/libcurses/background.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/background.c
diff -u src/lib/libcurses/background.c:1.19 src/lib/libcurses/background.c:1.20
--- src/lib/libcurses/background.c:1.19	Sun Nov 18 20:26:29 2018
+++ src/lib/libcurses/background.c	Sun Nov 18 21:01:16 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: background.c,v 1.19 2018/11/18 20:26:29 uwe Exp $	*/
+/*	$NetBSD: background.c,v 1.20 2018/11/18 21:01:16 uwe Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: background.c,v 1.19 2018/11/18 20:26:29 uwe Exp $");
+__RCSID("$NetBSD: background.c,v 1.20 2018/11/18 21:01:16 uwe Exp $");
 #endif				/* not lint */
 
 #include <stdlib.h>
@@ -95,13 +95,8 @@ wbkgd(WINDOW *win, chtype ch)
 	__CTRACE(__CTRACE_ATTR, "wbkgd: (%p), '%s', %08x\n",
 	    win, unctrl(ch & __CHARTEXT), ch & __ATTRIBUTES);
 #endif
-
-	/* Background attributes (check colour). */
-	if (__using_color && !(ch & __COLOR))
-		ch |= __default_color;
-
-	win->battr = (attr_t) ch & __ATTRIBUTES;
 	wbkgdset(win, ch);
+
 	for (y = 0; y < win->maxy; y++)
 		for (x = 0; x < win->maxx; x++) {
 			/* Copy character if space */

Reply via email to