ncurses 5.7 - patch 20090607

+ fix a regression in lib_tputs.c, from ongoing merges.

diff --git a/NEWS b/NEWS
index b84e0a4b579a00910c7c507e2dd3cded4769a09d..a9750c74c0d4ed043086437880d17fcd6b6b4790 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1393 2009/06/06 21:41:06 tom Exp $
+-- $Id: NEWS,v 1.1394 2009/06/07 14:02:55 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,9 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20090607
+       + fix a regression in lib_tputs.c, from ongoing merges.
+
 20090606
        + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete).
 

diff --git a/dist.mk b/dist.mk
index 227a8fb8e18fecfe9275f270c80ce2724c33a7ad..abd9cb3ecdaa9eff04aa5c5ed8d411b16052ed8b 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.703 2009/06/06 15:37:29 tom Exp $
+# $Id: dist.mk,v 1.704 2009/06/07 13:31:18 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 7
-NCURSES_PATCH = 20090606
+NCURSES_PATCH = 20090607
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index 6cadbca19003a24e17f4e12c148a29fb4ccc4695..b123cceef243eece1fe0aaefe3fa29bf1284f9a2 100644 (file)
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -51,7 +51,7 @@
 #include <termcap.h>           /* ospeed */
 #include <tic.h>
 
-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 {