summaryrefslogtreecommitdiff
path: root/test/insdelln.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/insdelln.c')
-rw-r--r--test/insdelln.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/test/insdelln.c b/test/insdelln.c
index d5034a4..34fb388 100644
--- a/test/insdelln.c
+++ b/test/insdelln.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2008-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 2008-2012,2014 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -26,7 +26,7 @@
* authorization. *
****************************************************************************/
/*
- * $Id: insdelln.c,v 1.5 2010/11/13 23:39:38 tom Exp $
+ * $Id: insdelln.c,v 1.9 2014/08/02 23:09:32 tom Exp $
*
* test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
*/
@@ -175,6 +175,8 @@ do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
delwin(win1);
touchwin(win);
} else {
+ if (win1)
+ delwin(win1);
beep();
}
}
@@ -300,7 +302,7 @@ test_winsdelln(WINDOW *win)
init_status(win, &st);
do {
- (void) wattrset(win, st.attr | (attr_t) COLOR_PAIR(st.pair));
+ (void) wattrset(win, AttrArg(COLOR_PAIR(st.pair), st.attr));
switch (st.ch) {
case 'i':
for (n = 0; n < st.count; ++n)
@@ -341,7 +343,7 @@ test_insdelln(void)
init_status(stdscr, &st);
do {
- (void) attrset(st.attr | (attr_t) COLOR_PAIR(st.pair));
+ (void) attrset(AttrArg(COLOR_PAIR(st.pair), st.attr));
switch (st.ch) {
case 'i':
for (n = 0; n < st.count; ++n)