update to ncurses-5.0-19991127

2 files changed, 8 insertions, 6 deletions

diff --git a/usr.bin/tic/dump_entry.c b/usr.bin/tic/dump_entry.c
index 691a5cb7f53..d1bc69ada01 100644
--- a/usr.bin/tic/dump_entry.c
+++ b/usr.bin/tic/dump_entry.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dump_entry.c,v 1.7 1999/03/22 18:43:19 millert Exp $	*/
+/*	$OpenBSD: dump_entry.c,v 1.8 1999/11/28 17:58:57 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998,1999 Free Software Foundation, Inc.                   *
@@ -40,7 +40,7 @@
 #include <termsort.c>		/* this C file is generated */
 #include <parametrized.h>	/* so is this */
 
-MODULE_ID("$From: dump_entry.c,v 1.37 1999/03/14 12:29:30 tom Exp $")
+MODULE_ID("$From: dump_entry.c,v 1.38 1999/11/27 23:00:21 tom Exp $")
 
 #define INDENT			8
 
@@ -628,7 +628,9 @@ bool	outcount = 0;
 	    {
 		char *src = _nc_tic_expand(tterm->Strings[i], outform==F_TERMINFO, numbers);
 		sprintf(buffer, "%s=", name);
-		if (pretty && outform==F_TERMINFO)
+		if (pretty
+		 && (outform == F_TERMINFO
+		  || outform == F_VARIABLE))
 		    fmt_complex(buffer + strlen(buffer), src, 1);
 		else
 		    strcat(buffer, src);
diff --git a/usr.bin/tic/tic.c b/usr.bin/tic/tic.c
index cb1bdb8c845..6e31152bf7c 100644
--- a/usr.bin/tic/tic.c
+++ b/usr.bin/tic/tic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tic.c,v 1.11 1999/06/27 08:17:46 millert Exp $	*/
+/*	$OpenBSD: tic.c,v 1.12 1999/11/28 17:58:57 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998,1999 Free Software Foundation, Inc.                   *
@@ -44,7 +44,7 @@
 #include <dump_entry.h>
 #include <term_entry.h>
 
-MODULE_ID("$From: tic.c,v 1.51 1999/06/19 21:35:36 Philippe.De.Muyter Exp $")
+MODULE_ID("$From: tic.c,v 1.52 1999/09/25 22:47:54 tom Exp $")
 
 const char *_nc_progname = "tic";
 
@@ -665,7 +665,7 @@ bool	check_only = FALSE;
 
 			len = dump_entry(&qp->tterm, limited, numbers, NULL);
 			for (j = 0; j < qp->nuses; j++)
-			    len += dump_uses((char *)(qp->uses[j].parent), infodump);
+			    len += dump_uses((char *)(qp->uses[j].parent), !capdump);
 			(void) putchar('\n');
 			if (debug_level != 0 && !limited)
 			    printf("# length=%d\n", len);