X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Flib_tputs.c;h=b123cceef243eece1fe0aaefe3fa29bf1284f9a2;hp=6cadbca19003a24e17f4e12c148a29fb4ccc4695;hb=dc6f2587b13a5294926467a2375922b3c30d302b;hpb=d4ede7c5fa6a269d338fea32cd93bf39083dda8c diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c index 6cadbca1..b123ccee 100644 --- a/ncurses/tinfo/lib_tputs.c +++ b/ncurses/tinfo/lib_tputs.c @@ -51,7 +51,7 @@ #include /* ospeed */ #include -MODULE_ID("$Id: lib_tputs.c,v 1.75 2009/05/30 19:44:43 tom Exp $") +MODULE_ID("$Id: lib_tputs.c,v 1.77 2009/06/07 13:59:11 tom Exp $") NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */ NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0; /* used by termcap library */ @@ -132,6 +132,7 @@ NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_DCLx int ch) COUNT_OUTCHARS(1); if (HasTInfoTerminal(SP_PARM) + && SP_PARM != 0 && SP_PARM->_cleanup) { char tmp = ch; /* @@ -226,7 +227,13 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx if (!VALID_STRING(string)) return ERR; - if (SP_PARM != 0 && SP_PARM->_term == 0) { + if ( +#if NCURSES_SP_FUNCS + (SP_PARM != 0 && SP_PARM->_term == 0) +#else + cur_term == 0 +#endif + ) { always_delay = FALSE; normal_delay = TRUE; } else {