From f344f8539c1543f8cd65a5bb142dbaf23b9421d2 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 15 Jan 2017 01:42:56 +0000 Subject: [PATCH] ncurses 6.0 - patch 20170114 + improve discussion of early history of tset/reset programs. + clarify in manual pages that the optional verbose option level is available only when ncurses is configured for tracing. + amend change from 20161231 to avoid writing traces to the standard error after initializing the trace feature using the environment variable. --- NEWS | 10 +++++++- VERSION | 2 +- dist.mk | 4 +-- doc/html/man/adacurses6-config.1.html | 2 +- doc/html/man/captoinfo.1m.html | 2 +- doc/html/man/clear.1.html | 2 +- doc/html/man/curs_trace.3x.html | 27 +++++++++++++++++++- doc/html/man/form.3x.html | 2 +- doc/html/man/infocmp.1m.html | 14 +++++++---- doc/html/man/infotocap.1m.html | 2 +- doc/html/man/menu.3x.html | 2 +- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/ncurses6-config.1.html | 2 +- doc/html/man/panel.3x.html | 2 +- doc/html/man/tabs.1.html | 2 +- doc/html/man/terminfo.5.html | 2 +- doc/html/man/tic.1m.html | 20 ++++++++------- doc/html/man/toe.1m.html | 19 ++++++++------ doc/html/man/tput.1.html | 8 +++--- doc/html/man/tset.1.html | 36 +++++++++++++++++++-------- man/curs_trace.3x | 21 +++++++++++++++- man/infocmp.1m | 9 ++++--- man/manhtml.aliases | 29 ++++++++++++++++++++- man/tic.1m | 6 +++-- man/toe.1m | 6 +++-- man/tput.1 | 5 +--- man/tset.1 | 30 ++++++++++++++++++---- ncurses/curses.priv.h | 3 ++- ncurses/tinfo/lib_data.c | 3 ++- ncurses/trace/lib_trace.c | 8 +++--- package/debian-mingw/changelog | 4 +-- package/debian-mingw64/changelog | 4 +-- package/debian/changelog | 4 +-- package/mingw-ncurses.nsi | 4 +-- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- 36 files changed, 216 insertions(+), 86 deletions(-) diff --git a/NEWS b/NEWS index eac8f2b8..60c9643f 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2732 2017/01/07 22:49:11 tom Exp $ +-- $Id: NEWS,v 1.2735 2017/01/14 20:59:06 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,14 @@ 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. +20170114 + + improve discussion of early history of tset/reset programs. + + clarify in manual pages that the optional verbose option level is + available only when ncurses is configured for tracing. + + amend change from 20161231 to avoid writing traces to the standard + error after initializing the trace feature using the environment + variable. + 20170107 + amend changes for tput to reset tty modes to "sane" if the program is run as "reset", like tset. Likewise, ensure that tset sends diff --git a/VERSION b/VERSION index 395fc777..72d55e8d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:9 6.0 20170107 +5:0:9 6.0 20170114 diff --git a/dist.mk b/dist.mk index b06dc4ed..3169477a 100644 --- 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.1141 2017/01/07 15:27:12 tom Exp $ +# $Id: dist.mk,v 1.1142 2017/01/14 15:30:30 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 = 6 NCURSES_MINOR = 0 -NCURSES_PATCH = 20170107 +NCURSES_PATCH = 20170114 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html index f4433a90..78408491 100644 --- a/doc/html/man/adacurses6-config.1.html +++ b/doc/html/man/adacurses6-config.1.html @@ -131,7 +131,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 6141188d..504ad66f 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -198,7 +198,7 @@

SEE ALSO

        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).

AUTHOR

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 4117f52e..eb12fa28 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -147,7 +147,7 @@

SEE ALSO

        tput(1), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).
 
 
 
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index d22a10c3..85ffaad0 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.17 2017/01/07 18:45:42 tom Exp @
+  * @Id: curs_trace.3x,v 1.18 2017/01/14 19:46:40 tom Exp @
 -->
 
 
@@ -182,6 +182,30 @@
            use_env, use_extended_names, use_tioctl
 
 
+

Command-line Utilities

+       The command-line utilities such as tic(1) provide  a  ver-
+       bose  option which extends the set of messages written us-
+       ing the trace function.  Both of these (-v and trace)  use
+       the same variable (_nc_tracing), which determines the mes-
+       sages which are written.
+
+       Because the command-line utilities may call initialization
+       functions   such  as  setupterm,  tgetent  or  use_extend-
+       ed_names, some of their debugging output may  be  directed
+       to  the  trace file if the NCURSES_TRACE environment vari-
+       able is set:
+
+       o   messages produced in the utility are  written  to  the
+           standard error.
+
+       o   messages  produced by the underlying library are writ-
+           ten to trace.
+
+       If ncurses is built without tracing, none  of  the  latter
+       are  produced,  and  fewer diagnostics are provided by the
+       command-line utilities.
+
+

RETURN VALUE

        Routines which return a value are designed to be  used  as
        parameters to the _tracef routine.
@@ -215,6 +239,7 @@
 
  • Functions
    • 
 
  • Trace Parameter
    • 
 
  • Initialization
    • 
+
  • Command-line Utilities
    • 
 
 
 
  • RETURN VALUE
    • 
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index bcfd3364..236f33c7 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -239,7 +239,7 @@
        curses(3x) and related pages whose names begin "form_" for
        detailed descriptions of the entry points.
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 93eeae71..25c65c2a 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -1,7 +1,7 @@
 
 
 
@@ -438,8 +438,12 @@
             program, and exits.
 
        -v n prints out tracing information on standard  error  as
-            the  program runs.  Higher values of n induce greater
-            verbosity.
+            the program runs.
+
+            The  optional  parameter  n is a number from 1 to 10,
+            inclusive, indicating the desired level of detail  of
+            information.   If  ncurses  is  built without tracing
+            support, the optional parameter is ignored.
 
        -W   By itself, the -w option will not force long  strings
             to be wrapped.  Use the -W option to do this.
@@ -478,7 +482,7 @@
 
        http://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).

    AUTHOR

    diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 34c9ef58..27d57e0c 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -88,7 +88,7 @@

    SEE ALSO

            curses(3x), tic(1m), infocmp(1m), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).

    AUTHOR

    diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 6ae3ccca..ef7baf8f 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -217,7 +217,7 @@
        curses(3x) and related pages whose names begin "menu_" for
        detailed descriptions of the entry points.
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index f0542543..256767c5 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@
        sonable optimization.  This implementation is "new curses"
        (ncurses) and is the approved replacement for 4.4BSD clas-
        sic  curses,  which has been discontinued.  This describes
-       ncurses version 6.0 (patch 20170107).
+       ncurses version 6.0 (patch 20170114).
 
        The ncurses library emulates the curses library of  System
        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index bf8285ef..1e693f15 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -114,7 +114,7 @@

    SEE ALSO

            curses(3x)
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index e489d861..15684b99 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -208,7 +208,7 @@

    SEE ALSO

            curses(3x), curs_variables(3x),
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).

    AUTHOR

    diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 41dad6d2..f11d3611 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -170,7 +170,7 @@

    SEE ALSO

            tset(1), infocmp(1m), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 00009cf8..40f2770f 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -75,7 +75,7 @@
        nals by giving a set of capabilities which they  have,  by
        specifying how to perform screen operations, and by speci-
        fying padding requirements and  initialization  sequences.
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).
 
        Entries in terminfo consist of a sequence of `,' separated
        fields (embedded commas may be escaped with a backslash or
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 6eb747a3..5a823454 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -1,6 +1,6 @@
 
 
 
@@ -277,12 +277,14 @@
             program, and exits.
 
        -vn  specifies  that  (verbose) output be written to stan-
-            dard error trace information showing tic's  progress.
-            The  optional  parameter  n is a number from 1 to 10,
-            inclusive, indicating the desired level of detail  of
-            information.   If  n is omitted, the default level is
-            1.  If n is specified and greater than 1,  the  level
-            of detail is increased.
+            dard error trace information showing tic's progress.
+
+            The optional parameter n is a number from  1  to  10,
+            inclusive,  indicating the desired level of detail of
+            information.  If ncurses  is  built  without  tracing
+            support,  the optional parameter is ignored.  If n is
+            omitted, the default level is 1.  If n  is  specified
+            and greater than 1, the level of detail is increased.
 
             The debug flag levels are as follows:
 
@@ -401,7 +403,7 @@
        infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
        curses(3x), term(5).  terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).

    AUTHOR

    diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 9d522d74..cbb0e79b 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -1,6 +1,6 @@
 
 
 
@@ -100,11 +100,14 @@
               depend on it, followed by a newline.
 
        -vn    specifies that (verbose) output be written to stan-
-              dard  error,  showing toe's progress.  The optional
-              parameter n is a number from 1 to  10,  interpreted
-              as for tic(1m).
+              dard error, showing toe's progress.
 
-       -V     reports  the  version  of ncurses which was used in
+              The  optional parameter n is a number from 1 to 10,
+              interpreted as for tic(1m).  If  ncurses  is  built
+              without  tracing support, the optional parameter is
+              ignored.
+
+       -V     reports the version of ncurses which  was  used  in
               this program, and exits.
 
 
@@ -114,10 +117,10 @@

    SEE ALSO

    -       tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
+       tic(1m),    infocmp(1m),   captoinfo(1m),   infotocap(1m),
        curses(3x), terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index dfb4c6a8..ad00b235 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.50 2017/01/07 23:03:28 tom Exp @
+  * @Id: tput.1,v 1.51 2017/01/14 20:49:40 tom Exp @
 -->
 
 
@@ -394,9 +394,7 @@
        AT&T  System  V  provided  a different tput command, whose
        init and reset  subcommands (more than half  the  program)
        were incorporated from the reset feature of BSD tset writ-
-       ten by Eric Allman.  Later the corresponding  source  code
-       for  reset  was  removed  from the BSD tset (in June 1993,
-       released in 4.4BSD-Lite a year later).
+       ten by Eric Allman.
 
        Keith Bostic replaced the BSD tput command in 1989 with  a
        new  implementation  based  on  the  AT&T System V program
@@ -500,7 +498,7 @@
        clear(1),    stty(1),   tabs(1),   tset(1),   terminfo(5),
        curs_termcap(3x).
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 5aab841a..d76c27d8 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.47 2017/01/07 22:59:51 tom Exp @
+  * @Id: tset.1,v 1.48 2017/01/14 20:55:07 tom Exp @
 -->
 
 
@@ -285,18 +285,34 @@

    HISTORY

    -       A  reset  command appeared in 2BSD (1979), written by Kurt
-       Shoens.
+       A  reset command appeared in 2BSD (April 1979), written by
+       Kurt Shoens.  This program set the erase and kill  charac-
+       ters  to  ^H  (backspace) and @ respectively.  Mark Horton
+       improved that in 3BSD (October 1979), adding  intr,  quit,
+       start/stop and eof characters as well as changing the pro-
+       gram to avoid modifying any user settings.
+
+       Later in 4.1BSD (December 1980), Mark Horton added a  call
+       to  the  tset  program  using the -I and -Q options, i.e.,
+       using that to improve  the  terminal  modes.   With  those
+       options,  that  version  of  reset did not use the termcap
+       database.
 
        A separate tset command was provided in 2BSD by Eric  All-
        man.   While  the oldest published source (from 1979) pro-
-       vides both programs, Allman's comments in the 2BSD  source
-       code indicate that he began work in October 1977, continu-
-       ing development over the next few years.
+       vides both tset and reset, Allman's comments in  the  2BSD
+       source  code  indicate that he began work in October 1977,
+       continuing development over the next few years.
 
-       In September 1980, Eric Allman modified tset to provide  a
-       "reset"  feature  when  the  program was invoked as reset.
-       This version appeared in 4.1cBSD, late in 1982.
+       In September 1980, Eric Allman modified tset,  adding  the
+       code  from  the  existing  "reset"  feature  when tset was
+       invoked as reset.  Rather than simply copying the existing
+       program,  in  this  merged  version, tset used the termcap
+       database to do additional (re)initialization of the termi-
+       nal.  This version appeared in 4.1cBSD, late in 1982.
+
+       Other  developers  (e.g., Keith Bostic and Jim Bloom) con-
+       tinued to modify tset until 4.4BSD was released in 1993.
 
        The ncurses implementation was lightly  adapted  from  the
        4.4BSD  sources for a terminfo environment by Eric S. Ray-
@@ -419,7 +435,7 @@
        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
        terminfo(5), ttys(5), environ(7)
 
-       This describes ncurses version 6.0 (patch 20170107).
+       This describes ncurses version 6.0 (patch 20170114).
 
 
 
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index 0627d1ba..64d4c18a 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.17 2017/01/07 18:45:42 tom Exp $
+.\" $Id: curs_trace.3x,v 1.18 2017/01/14 19:46:40 tom Exp $
 .de bP
 .IP \(bu 4
 ..
@@ -190,6 +190,25 @@ use_tioctl
 .hy
 .ad
 .RE
+.SS Command-line Utilities
+.PP
+The command-line utilities such as \fBtic\fP(1) provide a verbose option
+which extends the set of messages written using the \fBtrace\fP function.
+Both of these (\fB\-v\fP and \fBtrace\fP)
+use the same variable (\fB_nc_tracing\fP),
+which determines the messages which are written.
+.PP
+Because the command-line utilities may call initialization functions
+such as \fBsetupterm\fP, \fBtgetent\fP or \fBuse_extended_names\fP,
+some of their debugging output may be directed to the \fItrace\fP file
+if the \fBNCURSES_TRACE\fP environment variable is set:
+.bP
+messages produced in the utility are written to the standard error.
+.bP
+messages produced by the underlying library are written to \fItrace\fP.
+.PP
+If ncurses is built without tracing, none of the latter are produced,
+and fewer diagnostics are provided by the command-line utilities.
 .SH RETURN VALUE
 Routines which return a value are designed to be used as parameters
 to the \fB_tracef\fR routine.
diff --git a/man/infocmp.1m b/man/infocmp.1m
index ef47b7a2..d01b0a15 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2016,2017 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            *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.59 2016/10/22 19:54:35 tom Exp $
+.\" $Id: infocmp.1m,v 1.60 2017/01/14 19:55:27 tom Exp $
 .TH @INFOCMP@ 1M ""
 .ds n 5
 .de bP
@@ -476,7 +476,10 @@ reports the version of ncurses which was used in this program, and exits.
 .TP 5
 \fB\-v\fR \fIn\fR
 prints out tracing information on standard error as the program runs.
-Higher values of n induce greater verbosity.
+.IP
+The optional parameter \fIn\fR is a number from 1 to 10, inclusive,
+indicating the desired level of detail of information.
+If ncurses is built without tracing support, the optional parameter is ignored.
 .TP
 \fB\-W\fR
 By itself, the \fB\-w\fP option will not force long strings to be wrapped.
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index d5b77be9..e27dc5ea 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,31 @@
-# $Id: manhtml.aliases,v 1.5 2017/01/07 20:28:43 tom Exp $
+# $Id: manhtml.aliases,v 1.6 2017/01/14 19:57:16 tom Exp $
+#***************************************************************************
+# Copyright (c) 2013-2016,2017 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            *
+# "Software"), to deal in the Software without restriction, including      *
+# without limitation the rights to use, copy, modify, merge, publish,      *
+# distribute, distribute with modifications, sublicense, and/or sell       *
+# copies of the Software, and to permit persons to whom the Software is    *
+# furnished to do so, subject to the following conditions:                 *
+#                                                                          *
+# The above copyright notice and this permission notice shall be included  *
+# in all copies or substantial portions of the Software.                   *
+#                                                                          *
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+# IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+# THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+#                                                                          *
+# Except as contained in this notice, the name(s) of the above copyright   *
+# holders shall not be used in advertising or otherwise to promote the     *
+# sale, use or other dealings in this Software without prior written       *
+# authorization.                                                           *
+#***************************************************************************
 # Items in this list will be linked to the corresponding manpages by man2html
 addch(3X)		curs_addch(3X)
 delscreen(3X)		curs_initscr(3X)
diff --git a/man/tic.1m b/man/tic.1m
index 53a96dd7..d0c42b95 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2016,2017 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: tic.1m,v 1.62 2016/10/01 17:14:50 tom Exp $
+.\" $Id: tic.1m,v 1.63 2017/01/14 19:50:09 tom Exp $
 .TH @TIC@ 1M ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -307,8 +307,10 @@ reports the version of ncurses which was used in this program, and exits.
 \fB\-v\fR\fIn\fR
 specifies that (verbose) output be written to standard error trace
 information showing \fB@TIC@\fR's progress.
+.IP
 The optional parameter \fIn\fR is a number from 1 to 10, inclusive,
 indicating the desired level of detail of information.
+If ncurses is built without tracing support, the optional parameter is ignored.
 If \fIn\fR is omitted, the default level is 1.
 If \fIn\fR is specified and greater than 1, the level of
 detail is increased.
diff --git a/man/toe.1m b/man/toe.1m
index 74b712c2..001a5d5f 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2011,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2015,2017 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: toe.1m,v 1.27 2015/08/29 22:04:48 tom Exp $
+.\" $Id: toe.1m,v 1.28 2017/01/14 19:55:36 tom Exp $
 .TH @TOE@ 1M ""
 .ds n 5
 .ds d @TERMINFO@
@@ -91,8 +91,10 @@ followed by a newline.
 \fB\-v\fR\fIn\fR
 specifies that (verbose) output be written to standard error,
 showing \fB@TOE@\fR's progress.
+.IP
 The optional parameter \fIn\fR is a number from 1 to 10,
 interpreted as for \fB@TIC@\fR(1M).
+If ncurses is built without tracing support, the optional parameter is ignored.
 .TP
 \fB\-V\fR
 reports the version of ncurses which was used in this program,
diff --git a/man/tput.1 b/man/tput.1
index 2f42daab..d17ffd1d 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.50 2017/01/07 23:03:28 tom Exp $
+.\" $Id: tput.1,v 1.51 2017/01/14 20:49:40 tom Exp $
 .TH @TPUT@ 1 ""
 .ds d @TERMINFO@
 .ds n 1
@@ -401,9 +401,6 @@ AT&T System V provided a different \fBtput\fP command,
 whose \fBinit\fP and \fBreset\fP  subcommands
 (more than half the program) were incorporated from
 the \fBreset\fP feature of BSD \fBtset\fP written by Eric Allman.
-Later the corresponding source code for \fIreset\fP
-was removed from the BSD \fBtset\fP
-(in June 1993, released in 4.4BSD-Lite a year later).
 .PP
 Keith Bostic replaced the BSD \fBtput\fP command in 1989 with a new implementation
 based on the AT&T System V program \fBtput\fP.
diff --git a/man/tset.1 b/man/tset.1
index dec57cb4..152618ad 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.47 2017/01/07 22:59:51 tom Exp $
+.\" $Id: tset.1,v 1.48 2017/01/14 20:55:07 tom Exp $
 .TH @TSET@ 1 ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -274,18 +274,38 @@ and that \fBcsh\fR users insert a backslash character (\*(``\e\*('') before
 any exclamation marks (\*(``!\*('').
 .SH HISTORY
 .PP
-A \fBreset\fP command appeared in 2BSD (1979), written by Kurt Shoens.
+A \fBreset\fP command appeared in 2BSD (April 1979), written by Kurt Shoens.
+This program set the \fIerase\fP and \fIkill\fP characters
+to \fB^H\fP (backspace) and \fB@\fP respectively.
+Mark Horton improved that in 3BSD (October 1979), adding
+\fIintr\fP, \fIquit\fP, \fIstart\fP/\fIstop\fP and \fIeof\fP characters
+as well as changing the program to avoid modifying any user settings.
+.PP
+Later in 4.1BSD (December 1980),
+Mark Horton added a call to the \fBtset\fP program
+using the \fB\-I\fP and \fB\-Q\fP options, i.e.,
+using that to improve the terminal modes.
+With those options,
+that version of \fBreset\fP did not use the termcap database.
 .PP
 A separate \fBtset\fP command was provided in 2BSD by Eric Allman.
-While the oldest published source (from 1979) provides both programs,
+While the oldest published source (from 1979)
+provides both \fBtset\fP and \fBreset\fP,
 Allman's comments in the 2BSD source code indicate
 that he began work in October 1977,
 continuing development over the next few years.
 .PP
-In September 1980, Eric Allman modified \fBtset\fP to provide a \*(lqreset\*(rq
-feature when the program was invoked as \fBreset\fP.
+In September 1980, Eric Allman modified \fBtset\fP,
+adding the code from the existing \*(lqreset\*(rq
+feature when \fBtset\fP was invoked as \fBreset\fP.
+Rather than simply copying the existing program,
+in this merged version, \fBtset\fP used the termcap database
+to do additional (re)initialization of the terminal.
 This version appeared in 4.1cBSD, late in 1982.
 .PP
+Other developers (e.g., Keith Bostic and Jim Bloom)
+continued to modify \fBtset\fP until 4.4BSD was released in 1993.
+.PP
 The \fBncurses\fR implementation
 was lightly adapted from the 4.4BSD sources for a terminfo environment by Eric
 S. Raymond .
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index de9d4f6a..4d1b4655 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.557 2017/01/07 19:45:37 tom Exp $
+ * $Id: curses.priv.h,v 1.558 2017/01/14 17:52:49 tom Exp $
  *
  *	curses.priv.h
  *
@@ -901,6 +901,7 @@ typedef struct {
 #endif
 
 #ifdef TRACE
+	bool		trace_opened;
 	char		trace_fname[PATH_MAX];
 	int		trace_level;
 	FILE		*trace_fp;
diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c
index 0d253ffc..41fc674d 100644
--- a/ncurses/tinfo/lib_data.c
+++ b/ncurses/tinfo/lib_data.c
@@ -42,7 +42,7 @@
 
 #include 
 
-MODULE_ID("$Id: lib_data.c,v 1.69 2017/01/07 19:51:37 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.70 2017/01/14 17:52:32 tom Exp $")
 
 /*
  * OS/2's native linker complains if we don't initialize public data when
@@ -168,6 +168,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
 #endif
 
 #ifdef TRACE
+    FALSE,			/* trace_opened */
     CHARS_0s,			/* trace_fname */
     0,				/* trace_level */
     NULL,			/* trace_fp */
diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index 4567054a..80ab6e12 100644
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 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            *
@@ -47,7 +47,7 @@
 
 #include 
 
-MODULE_ID("$Id: lib_trace.c,v 1.85 2016/12/31 13:50:06 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.86 2017/01/14 17:53:42 tom Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -87,6 +87,7 @@ NCURSES_EXPORT_VAR(long) _nc_outchars = 0;
 
 #define MyFP		_nc_globals.trace_fp
 #define MyFD		_nc_globals.trace_fd
+#define MyInit		_nc_globals.trace_opened
 #define MyPath		_nc_globals.trace_fname
 #define MyLevel		_nc_globals.trace_level
 #define MyNested	_nc_globals.nested_tracef
@@ -95,6 +96,7 @@ NCURSES_EXPORT(void)
 trace(const unsigned int tracelevel)
 {
     if ((MyFP == 0) && tracelevel) {
+	MyInit = TRUE;
 	if (MyFD >= 0) {
 	    MyFP = fdopen(MyFD, "wb");
 	} else {
@@ -160,7 +162,7 @@ _nc_va_tracef(const char *fmt, va_list ap)
 
 #ifdef TRACE
     /* verbose-trace in the command-line utilities relies on this */
-    if (fp == 0 && _nc_tracing >= DEBUG_LEVEL(1))
+    if (fp == 0 && !MyInit && _nc_tracing >= DEBUG_LEVEL(1))
 	fp = stderr;
 #endif
 
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 09fb9969..72d49760 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170107) unstable; urgency=low
+ncurses6 (6.0+20170114) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 07 Jan 2017 10:27:12 -0500
+ -- Thomas E. Dickey   Sat, 14 Jan 2017 10:30:30 -0500
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 09fb9969..72d49760 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170107) unstable; urgency=low
+ncurses6 (6.0+20170114) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 07 Jan 2017 10:27:12 -0500
+ -- Thomas E. Dickey   Sat, 14 Jan 2017 10:30:30 -0500
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index a98a0ec2..f36fb6eb 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170107) unstable; urgency=low
+ncurses6 (6.0+20170114) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 07 Jan 2017 10:27:12 -0500
+ -- Thomas E. Dickey   Sat, 14 Jan 2017 10:30:30 -0500
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 41aa7d0c..bf4d6a07 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.192 2017/01/07 15:27:12 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.193 2017/01/14 15:30:30 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "0"
 !define VERSION_YYYY  "2017"
-!define VERSION_MMDD  "0107"
+!define VERSION_MMDD  "0114"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 306c1c7d..ac15aedd 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0
-Release: 20170107
+Release: 20170114
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 4bdf0ebd..ff4ca05e 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0
-Release: 20170107
+Release: 20170114
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
-- 
2.44.0