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/attributes.c,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libcurses/attributes.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- src/lib/libcurses/attributes.c	2019/07/25 20:18:50	1.31
+++ src/lib/libcurses/attributes.c	2021/09/06 07:03:49	1.32
@@ -1,4 +1,4 @@
-/*	$NetBSD: attributes.c,v 1.31 2019/07/25 20:18:50 uwe Exp $	*/
+/*	$NetBSD: attributes.c,v 1.32 2021/09/06 07:03:49 rin Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: attributes.c,v 1.31 2019/07/25 20:18:50 uwe Exp $");
+__RCSID("$NetBSD: attributes.c,v 1.32 2021/09/06 07:03:49 rin Exp $");
 #endif				/* not lint */
 
 #include "curses.h"
@@ -143,9 +143,7 @@ attrset(int attr)
 int
 wattr_get(WINDOW *win, attr_t *attr, short *pair, void *opts)
 {
-#ifdef DEBUG
 	__CTRACE(__CTRACE_ATTR, "wattr_get: win %p\n", win);
-#endif
 	if (attr != NULL) {
 		*attr = win->wattr;
 #ifdef HAVE_WCHAR
@@ -195,10 +193,8 @@ wattr_off(WINDOW *win, attr_t attr, void
 int
 wattr_set(WINDOW *win, attr_t attr, short pair, void *opts)
 {
-#ifdef DEBUG
 	__CTRACE(__CTRACE_ATTR, "wattr_set: win %p, attr %08x, pair %d\n",
 	    win, attr, pair);
-#endif
 	if (__predict_false(opts != NULL))
 		return ERR;
 
@@ -221,9 +217,7 @@ wattr_set(WINDOW *win, attr_t attr, shor
 int
 wcolor_set(WINDOW *win, short pair, void *opts)
 {
-#ifdef DEBUG
 	__CTRACE(__CTRACE_COLOR, "wolor_set: win %p, pair %d\n", win, pair);
-#endif
 	__wcolor_set(win, (attr_t) COLOR_PAIR(pair));
 	return OK;
 }
@@ -237,9 +231,7 @@ wcolor_set(WINDOW *win, short pair, void
 chtype
 getattrs(WINDOW *win)
 {
-#ifdef DEBUG
 	__CTRACE(__CTRACE_ATTR, "getattrs: win %p\n", win);
-#endif
 	return((chtype) win->wattr);
 }
 
@@ -250,9 +242,7 @@ getattrs(WINDOW *win)
 int
 wattron(WINDOW *win, int attr)
 {
-#ifdef DEBUG
 	__CTRACE(__CTRACE_ATTR, "wattron: win %p, attr %08x\n", win, attr);
-#endif
 	return __wattr_on(win, (attr_t) attr);
 }
 
@@ -263,9 +253,7 @@ wattron(WINDOW *win, int attr)
 int
 wattroff(WINDOW *win, int attr)
 {
-#ifdef DEBUG
 	__CTRACE(__CTRACE_ATTR, "wattroff: win %p, attr %08x\n", win, attr);
-#endif
 	return __wattr_off(win, (attr_t) attr);
 }
 
@@ -277,9 +265,7 @@ wattroff(WINDOW *win, int attr)
 int
 wattrset(WINDOW *win, int attr)
 {
-#ifdef DEBUG
 	__CTRACE(__CTRACE_ATTR, "wattrset: win %p, attr %08x\n", win, attr);
-#endif
 	__wattr_off(win, __ATTRIBUTES);
 	__wattr_on(win, (attr_t) attr);
 	return OK;
@@ -294,13 +280,9 @@ termattrs(void)
 {
 	chtype ch = 0;
 
-#ifdef DEBUG
 	__CTRACE(__CTRACE_ATTR, "termattrs\n");
-#endif
 	if (exit_attribute_mode != NULL) {
-#ifdef DEBUG
 	__CTRACE(__CTRACE_ATTR, "termattrs: have exit attribute mode\n");
-#endif
 		if (enter_blink_mode != NULL)
 			ch |= __BLINK;
 		if (enter_bold_mode != NULL)
@@ -335,9 +317,7 @@ term_attrs(void)
 {
 	attr_t attr = 0;
 
-#ifdef DEBUG
 	__CTRACE(__CTRACE_ATTR, "term_attrs\n");
-#endif
 	if (exit_attribute_mode != NULL) {
 		if (enter_blink_mode != NULL)
 			attr |= __BLINK;
@@ -383,9 +363,7 @@ __wattr_on(WINDOW *win, attr_t attr)
 {
 	const TERMINAL *t = win->screen->term;
 
-#ifdef DEBUG
 	__CTRACE(__CTRACE_ATTR, "wattr_on: win %p, attr %08x\n", win, attr);
-#endif
 	/* If can enter modes, set the relevent attribute bits. */
 	if (t_exit_attribute_mode(t) != NULL) {
 		if (attr & __BLINK && t_enter_blink_mode(t) != NULL)
@@ -432,9 +410,7 @@ __wattr_off(WINDOW *win, attr_t attr)
 {
 	const TERMINAL *t = win->screen->term;
 
-#ifdef DEBUG
 	__CTRACE(__CTRACE_ATTR, "wattr_off: win %p, attr %08x\n", win, attr);
-#endif
 	/* If can do exit modes, unset the relevent attribute bits. */
 	if (t_exit_attribute_mode(t) != NULL) {
 		if (attr & __BLINK)