From: Thomas E. Dickey Date: Sun, 21 Jul 2019 01:22:45 +0000 (+0000) Subject: ncurses 6.1 - patch 20190720 X-Git-Tag: v6.2~29 X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=a8dfaf0998c91b39c5c0a4913987cd67ca622bff ncurses 6.1 - patch 20190720 + fix a few warnings for gcc 4.x + add some portability/historical details to the tic, toe and infocmp manual pages. + correct fix for broken link from terminfo(5) to tabs(1) manpage (report by Sven Joachim). --- diff --git a/NEWS b/NEWS index c5985433..e4f683c2 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.3347 2019/07/13 23:10:57 tom Exp $ +-- $Id: NEWS,v 1.3351 2019/07/21 00:33:00 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,13 @@ 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. +20190720 + + fix a few warnings for gcc 4.x + + add some portability/historical details to the tic, toe and infocmp + manual pages. + + correct fix for broken link from terminfo(5) to tabs(1) manpage + (report by Sven Joachim). + 20190713 + change reset's behavior for margins to simply clear soft-margins if possible, rather than clearing and then setting them according to the diff --git a/VERSION b/VERSION index 3eb49ed5..7788d99b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.1 20190713 +5:0:10 6.1 20190720 diff --git a/dist.mk b/dist.mk index b6c6a5f9..8cfa04a0 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.1294 2019/07/13 20:42:44 tom Exp $ +# $Id: dist.mk,v 1.1296 2019/07/20 10:26: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 = 1 -NCURSES_PATCH = 20190713 +NCURSES_PATCH = 20190720 # 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 38cbacf7..2233257d 100644 --- a/doc/html/man/adacurses6-config.1.html +++ b/doc/html/man/adacurses6-config.1.html @@ -125,7 +125,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index da1e53fc..b19a788a 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -190,7 +190,7 @@

SEE ALSO

        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).

AUTHOR

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index a7cc3039..ecdcb207 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -148,7 +148,7 @@

SEE ALSO

        tput(1), terminfo(5)
 
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).
 
 
 
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 0e47dcc2..69517d68 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -141,22 +141,23 @@
        wchar_t  is  a  unsigned type.  All of the vendors implement this using
        wint_t, following the standard.
 
-       X/Open Curses issue 7 is unclear regarding whether the terminating null
-       wchar_t  value is counted in the length parameter n.  X/Open Curses is-
-       sue 7 revised the corresponding description of wgetnstr to address this
-       issue.   The unrevised description of wget_nwstr can be interpreted ei-
-       ther way.  This implementation counts the terminator in the length.
+       X/Open Curses, Issue 7 (2009) is unclear regarding whether  the  termi-
+       nating null wchar_t value is counted in the length parameter n.  X/Open
+       Curses, Issue 7 revised the corresponding description  of  wgetnstr  to
+       address this issue.  The unrevised description of wget_nwstr can be in-
+       terpreted either way.  This implementation counts the terminator in the
+       length.
 
-       X/Open Curses does not specify what happens if the length  n  is  nega-
+       X/Open  Curses  does  not specify what happens if the length n is nega-
        tive.
 
-       o   For  analogy  with  wgetnstr,  ncurses  6.2  uses a limit (based on
+       o   For analogy with wgetnstr, ncurses  6.2  uses  a  limit  (based  on
            LINE_MAX).
 
-       o   Some other implementations (such as Solaris xcurses) do  the  same,
+       o   Some  other  implementations (such as Solaris xcurses) do the same,
            while others (PDCurses) do not allow this.
 
-       o   NetBSD  7 curses imitates ncurses 6.1 in this regard, treating a -1
+       o   NetBSD 7 curses imitates ncurses 6.1 in this regard, treating a  -1
            as an indefinite number of characters.
 
 
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 594c4119..8c4c7bca 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -457,17 +457,48 @@
        /usr/share/terminfo Compiled terminal description database.
 
 
+

HISTORY

+       Although System V Release 2 provided a terminfo library, it had no doc-
+       umented tool for decompiling the terminal  descriptions.   Tony  Hansen
+       (AT&T) wrote the first infocmp in early 1984, for System V Release 3.
+
+       Eric  Raymond used the AT&T documentation in 1995 to provide an equiva-
+       lent infocmp for ncurses.  In addition, he added  a  few  new  features
+       such as:
+
+       o   the  -e option, to support fallback (compiled-in) terminal descrip-
+           tions
+
+       o   the -i option, to help with analysis
+
+       Later, Thomas Dickey added the -x (user-defined  capabilities)  option,
+       and  the  -E option to support fallback entries with user-defined capa-
+       bilities.
+
+       For a complete list, see the EXTENSIONS section.
+
+       In 2010, Roy Marples provided an infocmp program  for  NetBSD.   It  is
+       less  capable  than  the  SVr4  or ncurses versions (e.g., it lacks the
+       sorting options documented in X/Open), but does include the  -x  option
+       adapted from ncurses.
+
+
+

PORTABILITY

+       X/Open  Curses,  Issue  7 (2009) provides a description of infocmp.  It
+       does not mention the options used for converting to termcap format.
+
+

EXTENSIONS

-       The  -0, -1, -E, -F, -G, -Q, -R, -T, -V, -a, -e, -f, -g, -i, -l, -p, -q
+       The -0, -1, -E, -F, -G, -Q, -R, -T, -V, -a, -e, -f, -g, -i, -l, -p,  -q
        and -t options are not supported in SVr4 curses.
 
        SVr4 infocmp does not distinguish between absent and cancelled capabil-
        ities.  Also, it shows missing integer capabilities as -1 (the internal
-       value used to represent missing integers).  This  implementation  shows
+       value  used  to represent missing integers).  This implementation shows
        those as "NULL", for consistency with missing strings.
 
-       The  -r  option's  notion of "termcap" capabilities is System V Release
-       4's.  Actual BSD curses versions will have a more restricted  set.   To
+       The -r option's notion of "termcap" capabilities is  System  V  Release
+       4's.   Actual  BSD curses versions will have a more restricted set.  To
        see only the 4.4BSD set, use -r -RBSD.
 
 
@@ -476,12 +507,12 @@

SEE ALSO

-       captoinfo(1m),   infotocap(1m),   tic(1m),  toe(1m),  curses(3x),  ter-
+       captoinfo(1m),  infotocap(1m),  tic(1m),  toe(1m),   curses(3x),   ter-
        minfo(5).  user_caps(5).
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).

AUTHOR

@@ -506,6 +537,8 @@
 
 
 
  • FILES
    • 
+
  • HISTORY
    • 
+
  • PORTABILITY
    • 
 
  • EXTENSIONS
    • 
 
  • BUGS
    • 
 
  • SEE ALSO
    • 
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 139073d5..0312efb2 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -85,7 +85,7 @@

    SEE ALSO

            curses(3x), tic(1m), infocmp(1m), terminfo(5)
 
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).

    AUTHOR

    diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 45cfb808..3616452a 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -221,7 +221,7 @@
        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 9e302db7..0747e5a4 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -59,7 +59,7 @@
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).
 
        The  ncurses  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 3e0639e5..c6ca6875 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -112,7 +112,7 @@

    SEE ALSO

            curses(3x)
 
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 6b01ed93..380bda9c 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -204,7 +204,7 @@

    SEE ALSO

            curses(3x), curs_variables(3x),
 
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).

    AUTHOR

    diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 82ee8f19..7466027b 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -205,7 +205,7 @@

    SEE ALSO

            tset(1), infocmp(1m), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 05e2f9ce..f4739df9 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -33,10 +33,34 @@
   ****************************************************************************
   * @Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp @
   * Head of terminfo man page ends here
-  * @Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp @
-  * Beginning of terminfo.tail file
-  * This file is part of ncurses.
-  * See "terminfo.head" for copyright.
+  ****************************************************************************
+  * Copyright (c) 1998-2018,2019 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.                                                           *
+  ****************************************************************************
+  * @Id: terminfo.tail,v 1.97 2019/07/20 10:20:57 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -74,7 +98,7 @@
        Terminfo describes terminals by giving a set of capabilities which they
        have, by specifying how to perform screen operations, and by specifying
        padding  requirements  and  initialization  sequences.   This describes
-       ncurses version 6.1 (patch 20190713).
+       ncurses version 6.1 (patch 20190720).

    Terminfo Entry Syntax

    @@ -2457,7 +2481,7 @@

    SEE ALSO

    -       tabs(1m),  tic(1m), infocmp(1m), curses(3x), curs_color(3x), curs_vari-
+       tabs(1),  tic(1m),  infocmp(1m), curses(3x), curs_color(3x), curs_vari-
        ables(3x), printf(3), term(5).  term_variables(3x).  user_caps(5).
 
 
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 035afa1e..d68a6aba 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.69 2019/05/18 22:48:40 tom Exp @
+  * @Id: tic.1m,v 1.74 2019/07/20 17:57:09 tom Exp @
 -->
 
 
@@ -324,35 +324,108 @@
        will be printed.
 
 
-

    COMPATIBILITY

    -       There is  some  evidence  that  historic  tic  implementations  treated
-       description  fields with no whitespace in them as additional aliases or
+

    HISTORY

    +       System V Release 2 provided  a  tic  utility.   It  accepted  a  single
+       option:  -v  (optionally  followed  by  a  number).   According to Ross
+       Ridge's comment in mytinfo, this version of tic was unable to represent
+       cancelled capabilities.
+
+       System  V  Release 3 provided a different tic utility, written by Pavel
+       Curtis, (originally named "compile" in pcurses).  This added an  option
+       -c  to check the file for errors, with the caveat that errors in "use="
+       links would not be reported.  System V Release 3 documented a few warn-
+       ing messages which did not appear in pcurses.  While the program itself
+       was changed little as development continued with System  V  Release  4,
+       the table of capabilities grew from 180 (pcurses) to 464 (Solaris).
+
+       In  early  development of ncurses (1993), Zeyd Ben-Halim used the table
+       from mytinfo to extend the  pcurses  table  to  469  capabilities  (456
+       matched  SVr4, 8 were only in SVr4, 13 were not in SVr4).  Of those 13,
+       11 were ultimately discarded (perhaps to  match  the  draft  of  X/Open
+       Curses).   The exceptions were memory_lock_above and memory_unlock (see
+       user_caps(5)).
+
+       Eric Raymond incorporated parts of mytinfo into  ncurses  to  implement
+       the  termcap-to-terminfo  source conversion, and extended that to begin
+       development of the corresponding terminfo-to-termcap source conversion,
+       Thomas  Dickey  completed  that  development over the course of several
+       years.
+
+       In 1999, Thomas Dickey added the  -x  option  to  support  user-defined
+       capabilities.
+
+       In  2010,  Roy  Marples provided a tic program and terminfo library for
+       NetBSD.  This implementation  adapts  several  features  from  ncurses,
+       including tic's -x option.
+
+       The  -c  option  tells tic to check for problems in the terminfo source
+       file.  Continued development provides additional checks:
+
+       o   pcurses had 8 warnings
+
+       o   ncurses in 1996 had 16 warnings
+
+       o   Solaris (SVr4) curses has 28 warnings
+
+       o   NetBSD tic in 2019 has 19 warnings.
+
+       o   ncurses in 2019 has 96 warnings
+
+       The checking done in ncurses' tic helps with the conversion to termcap,
+       as well as pointing out errors and inconsistencies.  It is also used to
+       ensure consistency with the user-defined capabilities.  There  are  527
+       distinct  capabilities  in ncurses' terminal database; 128 of those are
+       user-defined.
+
+
+

    PORTABILITY

    +       X/Open Curses, Issue 7 (2009) provides a brief description of tic.   It
+       lists  one  option:  -c.  The omission of -v is unexpected.  The change
+       history states that  the  description  is  derived  from  True64  UNIX.
+       According  to  its  manual  pages,  that  system  also supported the -v
+       option.
+
+       Shortly after Issue 7 was released,  Tru64  was  discontinued.   As  of
+       2019,  the  surviving  implementations  of tic are SVr4 (AIX, HP-UX and
+       Solaris), ncurses and NetBSD curses.
+
+       The X/Open rationale states that some implementations of tic read  ter-
+       minal  descriptions  from  the  standard input if the file parameter is
+       omitted.  None of these implementations do that.  Further, it  comments
+       that some may choose to read from "./terminfo.src" but that is obsoles-
+       cent behavior from SVr2, and is not (for example) a documented  feature
+       of SVr3.
+
+
+

    COMPATIBILITY

    +       There  is  some  evidence  that  historic  tic  implementations treated
+       description fields with no whitespace in them as additional aliases  or
        short names.  This tic does not do that, but it does warn when descrip-
-       tion  fields may be treated that way and check them for dangerous char-
+       tion fields may be treated that way and check them for dangerous  char-
        acters.
 
 
-

    EXTENSIONS

    -       Unlike the SVr4 tic command, this implementation can  actually  compile
-       termcap  sources.   In fact, entries in terminfo and termcap syntax can
-       be mixed in a single source file.  See  terminfo(5)  for  the  list  of
+

    EXTENSIONS

    +       Unlike  the  SVr4 tic command, this implementation can actually compile
+       termcap sources.  In fact, entries in terminfo and termcap  syntax  can
+       be  mixed  in  a  single  source file.  See terminfo(5) for the list of
        termcap names taken to be equivalent to terminfo names.
 
-       The  SVr4  manual  pages  are not clear on the resolution rules for use
-       capabilities.  This implementation of tic will find  use  targets  any-
-       where  in  the source file, or anywhere in the file tree rooted at TER-
-       MINFO (if TERMINFO is defined), or in the user's $HOME/.terminfo  data-
+       The SVr4 manual pages are not clear on the  resolution  rules  for  use
+       capabilities.   This  implementation  of tic will find use targets any-
+       where in the source file, or anywhere in the file tree rooted  at  TER-
+       MINFO  (if TERMINFO is defined), or in the user's $HOME/.terminfo data-
        base (if it exists), or (finally) anywhere in the system's file tree of
        compiled entries.
 
-       The error messages from this tic have the same format as  GNU  C  error
+       The  error  messages  from this tic have the same format as GNU C error
        messages, and can be parsed by GNU Emacs's compile facility.
 
-       The  -0, -1, -C, -G, -I, -N, -R, -T, -V, -a, -e, -f, -g, -o, -r, -s, -t
+       The -0, -1, -C, -G, -I, -N, -R, -T, -V, -a, -e, -f, -g, -o, -r, -s,  -t
        and -x options are not supported under SVr4.  The SVr4 -c mode does not
-       report bad use links.
+       report bad "use=" links.
 
-       System  V  does  not  compile  entries  to  or  read  entries from your
+       System V does  not  compile  entries  to  or  read  entries  from  your
        $HOME/.terminfo database unless TERMINFO is explicitly set to it.
 
 
@@ -365,7 +438,7 @@
        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
        term(5).  terminfo(5).  user_caps(5).
 
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).

    AUTHOR

    @@ -387,8 +460,13 @@
 
  • PROCESSING
    • 
 
 
-
  • COMPATIBILITY
    • 
-
  • EXTENSIONS
    • 
+
  • HISTORY
    • 
+
  • PORTABILITY
+
+
    • 
 
  • FILES
    • 
 
  • SEE ALSO
    • 
 
  • AUTHOR
    • 
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 829d65a0..9ef5d0aa 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -1,6 +1,6 @@
 
 
 
@@ -104,16 +104,73 @@
               and exits.
 
 
+

    EXAMPLES

    +       Without sorting, the -a option reports all of the names found in all of
+       the terminal databases found by the TERMINFO and TERMINFO_DIRS environ-
+       ment variables:
+
+           MtxOrb162      16x2 Matrix Orbital LCD display
+           MtxOrb204      20x4 Matrix Orbital LCD display
+           MtxOrb         Generic Matrix Orbital LCD display
+           qvt101+        qume qvt 101 PLUS product
+           qvt119+-25     QVT 119 PLUS with 25 data lines
+           qansi-g        QNX ANSI
+           qvt103         qume qvt 103
+           qnxw           QNX4 windows
+           qansi-w        QNX ansi for windows
+           qnxm           QNX4 with mouse events
+           qvt203-25-w    QVT 203 PLUS with 25 by 132 columns
+           qansi-t        QNX ansi without console writes
+           . . .
+
+       Use the -a and -s options together to show where each terminal descrip-
+       tion was found:
+
+           --> /usr/local/ncurses/share/terminfo
+           ----> /usr/share/terminfo
+           *-+-:     9term          Plan9 terminal emulator for X
+           *---:     Eterm          Eterm with xterm-style color support (X Window System)
+           *-*-:     Eterm-256color Eterm with xterm 256-colors
+           *-*-:     Eterm-88color  Eterm with 88 colors
+           *-+-:     MtxOrb         Generic Matrix Orbital LCD display
+           *-+-:     MtxOrb162      16x2 Matrix Orbital LCD display
+           *-+-:     MtxOrb204      20x4 Matrix Orbital LCD display
+           *-*-:     NCR260VT300WPP NCR 2900_260 vt300 wide mode pc+  kybd
+           *-+-:     aaa            ann arbor ambassador/30 lines
+           *-+-:     aaa+dec        ann arbor ambassador in dec vt100 mode
+           *-+-:     aaa+rv         ann arbor ambassador in reverse video
+           . . .
+
+

    FILES

            /usr/share/terminfo/?/*
             Compiled terminal description database.
 
 
+

    HISTORY

    +       This  utility  is  not  provided by other implementations.  There is no
+       relevant X/Open or POSIX standard for toe.
+
+       The program name refers to a developer's pun:
+
+       o   tic,
+
+       o   tac (now tack),
+
+       o   toe.
+
+       It replaced a -T option which was  briefly  supported  by  the  ncurses
+       infocmp utility in 1995.
+
+       The  -a  and -s options were added to toe several years later (2006 and
+       2011, respectively).
+
+

    SEE ALSO

            tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
        minfo(5).
 
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).
 
 
 
@@ -124,7 +181,9 @@
 
  • NAME
    • 
 
  • SYNOPSIS
    • 
 
  • DESCRIPTION
    • 
+
  • EXAMPLES
    • 
 
  • FILES
    • 
+
  • HISTORY
    • 
 
  • SEE ALSO
    • 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 9ff66a3e..2a79c917 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -522,7 +522,7 @@

    SEE ALSO

            clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
 
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 3b2a35af..3345d2cc 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -389,7 +389,7 @@
        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
        ttys(5), environ(7)
 
-       This describes ncurses version 6.1 (patch 20190713).
+       This describes ncurses version 6.1 (patch 20190720).
 
 
 
diff --git a/include/tic.h b/include/tic.h
index 5a0bfbea..66252aec 100644
--- a/include/tic.h
+++ b/include/tic.h
@@ -33,7 +33,7 @@
  ****************************************************************************/
 
 /*
- * $Id: tic.h,v 1.78 2019/03/10 00:06:02 tom Exp $
+ * $Id: tic.h,v 1.79 2019/07/20 20:19:54 tom Exp $
  *	tic.h - Global variables and structures for the terminfo compiler.
  */
 
@@ -93,7 +93,7 @@ extern "C" {
 
 #define IS_TIC_MAGIC(p)	(LOW_MSB(p) == MAGIC || LOW_MSB(p) == MAGIC2)
 
-#define quick_prefix(s) (!strncmp((s), "b64:", 4) || !strncmp((s), "hex:", 4))
+#define quick_prefix(s) (!strncmp((s), "b64:", (size_t)4) || !strncmp((s), "hex:", (size_t)4))
 
 /*
  * The "maximum" here is misleading; XSI guarantees minimum values, which a
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 6c0d0633..c869a212 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 2002-2017,2018 Free Software Foundation, Inc.              *
+.\" Copyright (c) 2002-2018,2019 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: curs_get_wstr.3x,v 1.16 2018/09/01 20:58:10 tom Exp $
+.\" $Id: curs_get_wstr.3x,v 1.18 2019/07/20 19:14:56 tom Exp $
 .TH curs_get_wstr 3X ""
 .de bP
 .ie n  .IP \(bu 4
@@ -189,10 +189,10 @@ The latter function \fIget_wch()\fP can return a negative value,
 while \fBwchar_t\fP is a unsigned type.
 All of the vendors implement this using \fBwint_t\fR, following the standard.
 .PP
-X/Open Curses issue 7 is unclear regarding whether
+X/Open Curses, Issue 7 (2009) is unclear regarding whether
 the terminating \fInull \fP\fBwchar_t\fP
 value is counted in the length parameter \fIn\fP.
-X/Open Curses issue 7 revised the corresponding description
+X/Open Curses, Issue 7 revised the corresponding description
 of \fBwgetnstr\fP to address this issue.
 The unrevised description of \fBwget_nwstr\fP can be interpreted either way.
 This implementation counts the terminator in the length.
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 378c2f0a..818dc903 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2018,2019 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: curs_getstr.3x,v 1.26 2018/09/01 20:34:52 tom Exp $
+.\" $Id: curs_getstr.3x,v 1.28 2019/07/20 19:14:56 tom Exp $
 .TH curs_getstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -140,10 +140,10 @@ string by those implementations was predictable but not useful
 The functions \fBgetnstr\fR, \fBmvgetnstr\fR, and \fBmvwgetnstr\fR were
 present but not documented in SVr4.
 .PP
-X/Open Curses issue 5 (2007) stated that these functions
+X/Open Curses, Issue 5 (2007) stated that these functions
 \*(``read at most \fIn\fP bytes\*(''
 but did not state whether the terminating NUL is counted in that limit.
-X/Open Curses issue 7 (2009) changed that to say they
+X/Open Curses, Issue 7 (2009) changed that to say they
 \*(``read at most \fIn\fP\-1 bytes\*(''
 to allow for the terminating NUL.
 As of 2018, some implementations do, some do not count it:
diff --git a/man/infocmp.1m b/man/infocmp.1m
index d12df261..cfee79a5 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.74 2019/05/18 22:00:55 tom Exp $
+.\" $Id: infocmp.1m,v 1.75 2019/07/20 18:42:11 tom Exp $
 .TH @INFOCMP@ 1M ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -560,6 +560,34 @@ using the \fB\-x\fR option of \fB@TIC@\fP.
 .TP 20
 \*d
 Compiled terminal description database.
+.SH HISTORY
+Although System V Release 2 provided a terminfo library,
+it had no documented tool for decompiling the terminal descriptions.
+Tony Hansen (AT&T) wrote the first \fBinfocmp\fP in early 1984,
+for System V Release 3.
+.PP
+Eric Raymond used the AT&T documentation in 1995 to provide an equivalent
+\fB@INFOCMP@\fP for ncurses.
+In addition, he added a few new features such as:
+.bP
+the \fB\-e\fP option, to support \fIfallback\fP
+(compiled-in) terminal descriptions
+.bP
+the \fB\-i\fP option, to help with analysis 
+.PP
+Later, Thomas Dickey added the \fB\-x\fP (user-defined capabilities)
+option, and the \fB\-E\fP option to support fallback entries with
+user-defined capabilities.
+.PP
+For a complete list, see the \fIEXTENSIONS\fP section.
+.PP
+In 2010, Roy Marples provided an \fBinfocmp\fP program for NetBSD.
+It is less capable than the SVr4 or ncurses versions
+(e.g., it lacks the sorting options documented in X/Open),
+but does include the \fB\-x\fP option adapted from ncurses.
+.SH PORTABILITY
+X/Open Curses, Issue 7 (2009) provides a description of \fBinfocmp\fP.
+It does not mention the options used for converting to termcap format.
 .SH EXTENSIONS
 The
 \fB\-0\fR,
diff --git a/man/man_db.renames b/man/man_db.renames
index ce768f92..8299df89 100644
--- a/man/man_db.renames
+++ b/man/man_db.renames
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames,v 1.54 2019/06/23 19:12:27 tom Exp $
+# $Id: man_db.renames,v 1.55 2019/07/20 10:18:12 Sven.Joachim Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -171,7 +171,6 @@ user_caps.5			user_caps.5
 wresize.3x			wresize.3ncurses
 #
 # Other:
-tabs.1m				tabs.1
 tack.1m				tack.1
 #
 getty.1				getty.8
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 9eeaa4f2..349a2b7e 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -1,7 +1,32 @@
-.\" $Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp $
-.\" Beginning of terminfo.tail file
-.\" This file is part of ncurses.
-.\" See "terminfo.head" for copyright.
+.\"***************************************************************************
+.\" Copyright (c) 1998-2018,2019 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.                                                           *
+.\"***************************************************************************
+.\"
+.\" $Id: terminfo.tail,v 1.97 2019/07/20 10:20:57 tom Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -1879,7 +1904,7 @@ Supports both the SVr4 set and the AIX extensions.
 \*d/?/*
 files containing terminal descriptions
 .SH SEE ALSO
-\fB@TABS@\fR(1M),
+\fB@TABS@\fR(1),
 \fB@TIC@\fR(1M),
 \fB@INFOCMP@\fR(1M),
 \fBcurses\fR(3X),
diff --git a/man/tic.1m b/man/tic.1m
index 5295b390..07111e89 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.69 2019/05/18 22:48:40 tom Exp $
+.\" $Id: tic.1m,v 1.74 2019/07/20 17:57:09 tom Exp $
 .TH @TIC@ 1M ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -402,14 +402,98 @@ Terminal names exceeding the maximum alias length
 (32 characters on systems with long filenames, 14 characters otherwise)
 will be truncated to the maximum alias length
 and a warning message will be printed.
-.SH COMPATIBILITY
+.SH HISTORY
+.PP
+System V Release 2 provided a \fBtic\fP utility.
+It accepted a single option: \fB\-v\fP (optionally followed by a number).
+According to Ross Ridge's comment in \fImytinfo\fP,
+this version of \fBtic\fP was
+unable to represent cancelled capabilities.
+.PP
+System V Release 3 provided a different \fBtic\fP utility,
+written by Pavel Curtis,
+(originally named \*(``compile\*('' in \fIpcurses\fP).
+This added an option \fB\-c\fP to check the file for
+errors, with the caveat that errors in \*(``use=\*('' links
+would not be reported.
+System V Release 3 documented a few warning messages which
+did not appear in \fIpcurses\fP.
+While the program itself was changed little as development
+continued with System V Release 4,
+the table of capabilities grew from 180 (\fIpcurses\fP) to 464 (Solaris).
+.PP
+In early development of ncurses (1993),
+Zeyd Ben-Halim used the table from \fImytinfo\fP to
+extend the \fIpcurses\fP table to 469 capabilities
+(456 matched SVr4, 8 were only in SVr4, 13 were not in SVr4).
+Of those 13, 11 were ultimately discarded
+(perhaps to match the draft of X/Open Curses).
+The exceptions were
+\fBmemory_lock_above\fP and
+\fBmemory_unlock\fP (see \fBuser_caps\fP(5)).
+.PP
+Eric Raymond incorporated parts of \fImytinfo\fP into ncurses
+to implement the termcap-to-terminfo source conversion,
+and extended that to begin development of 
+the corresponding terminfo-to-termcap source conversion,
+Thomas Dickey completed that development over the course of several years.
+.PP
+In 1999, Thomas Dickey added the \fB\-x\fP option
+to support user-defined capabilities.
+.PP
+In 2010, Roy Marples provided a \fBtic\fP program
+and terminfo library for NetBSD.
+This implementation adapts several features from ncurses,
+including \fB@TIC@\fP's \fB\-x\fP option.
+.PP
+The \fB\-c\fP option tells \fB@TIC@\fP to check for problems in the
+terminfo source file.
+Continued development provides additional checks:
+.bP
+\fIpcurses\fP had 8 warnings
+.bP
+ncurses in 1996 had 16 warnings
+.bP
+Solaris (SVr4) curses has 28 warnings
+.bP
+NetBSD tic in 2019 has 19 warnings.
+.bP
+ncurses in 2019 has 96 warnings
+.PP
+The checking done in ncurses' \fB@TIC@\fP helps with the conversion to
+termcap, as well as pointing out errors and inconsistencies.
+It is also used to ensure consistency with the user-defined capabilities.
+There are 527 distinct capabilities in ncurses' terminal database;
+128 of those are user-defined.
+.SH PORTABILITY
+.PP
+X/Open Curses, Issue 7 (2009) provides a brief description of \fBtic\fP.
+It lists one option: \fB\-c\fP.
+The omission of \fB\-v\fP is unexpected.
+The change history states that the description is derived from True64 UNIX.
+According to its manual pages, that system also supported the \fB\-v\fP option.
+.PP
+Shortly after Issue 7 was released, Tru64 was discontinued.
+As of 2019, the surviving implementations of \fBtic\fP
+are SVr4 (AIX, HP-UX and Solaris),
+ncurses
+and NetBSD curses.
+.PP
+The X/Open rationale states that some implementations of \fBtic\fP
+read terminal descriptions from the standard input if the \fIfile\fP
+parameter is omitted.
+None of these implementations do that.
+Further, it comments that some may choose to read from \*(''./terminfo.src\*(''
+but that is obsolescent behavior from SVr2,
+and is not (for example) a documented feature of SVr3.
+.SS COMPATIBILITY
 There is some evidence that historic \fB@TIC@\fR implementations treated
 description fields with no whitespace in them as additional aliases or
 short names.
 This \fB@TIC@\fR does not do that, but it does warn when
 description fields may be treated that way and check them for dangerous
 characters.
-.SH EXTENSIONS
+.SS EXTENSIONS
 Unlike the SVr4 \fB@TIC@\fR command, this implementation can actually
 compile termcap sources.
 In fact, entries in terminfo and termcap syntax can
@@ -451,7 +535,7 @@ The
 \fB\-x\fR
 options
 are not supported under SVr4.
-The SVr4 \fB\-c\fR mode does not report bad use links.
+The SVr4 \fB\-c\fR mode does not report bad \*(``use=\*('' links.
 .PP
 System V does not compile entries to or read entries from your
 \fI$HOME/.terminfo\fR database unless TERMINFO is explicitly set to it.
diff --git a/man/toe.1m b/man/toe.1m
index ed839152..2b449546 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2015,2017 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2017,2019 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,12 +26,30 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.29 2017/02/18 17:10:26 tom Exp $
+.\" $Id: toe.1m,v 1.31 2019/07/20 19:06:44 tom Exp $
 .TH @TOE@ 1M ""
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.de NS
+.ie n  .sp
+.el    .sp .5
+.ie n  .in +4
+.el    .in +2
+.nf
+.ft C			\" Courier
+..
+.de NE
+.fi
+.ft R
+.ie n  .in -4
+.el    .in -2
+..
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
@@ -103,10 +121,66 @@ If ncurses is built without tracing support, the optional parameter is ignored.
 \fB\-V\fR
 reports the version of ncurses which was used in this program,
 and exits.
+.SH EXAMPLES
+.PP
+Without sorting, the \fB\-a\fP option reports all of the names found
+in all of the terminal databases found by the \fBTERMINFO\fP and
+\fBTERMINFO_DIRS\fP environment variables:
+.NS
+MtxOrb162 	16x2 Matrix Orbital LCD display
+MtxOrb204 	20x4 Matrix Orbital LCD display
+MtxOrb    	Generic Matrix Orbital LCD display
+qvt101+   	qume qvt 101 PLUS product
+qvt119+-25	QVT 119 PLUS with 25 data lines
+qansi-g   	QNX ANSI
+qvt103    	qume qvt 103
+qnxw      	QNX4 windows
+qansi-w   	QNX ansi for windows
+qnxm      	QNX4 with mouse events
+qvt203-25-w	QVT 203 PLUS with 25 by 132 columns
+qansi-t   	QNX ansi without console writes
+\&.\ .\ .
+.NE
+.PP
+Use the \fB\-a\fP and \fB\-s\fP options together to show where each terminal
+description was found:
+.NS
+--> /usr/local/ncurses/share/terminfo
+----> /usr/share/terminfo
+*-+-:	9term     	Plan9 terminal emulator for X
+*---:	Eterm     	Eterm with xterm-style color support (X Window System)
+*-*-:	Eterm-256color	Eterm with xterm 256-colors
+*-*-:	Eterm-88color	Eterm with 88 colors
+*-+-:	MtxOrb    	Generic Matrix Orbital LCD display
+*-+-:	MtxOrb162 	16x2 Matrix Orbital LCD display
+*-+-:	MtxOrb204 	20x4 Matrix Orbital LCD display
+*-*-:	NCR260VT300WPP	NCR 2900_260 vt300 wide mode pc+  kybd
+*-+-:	aaa       	ann arbor ambassador/30 lines
+*-+-:	aaa+dec   	ann arbor ambassador in dec vt100 mode
+*-+-:	aaa+rv    	ann arbor ambassador in reverse video
+\&.\ .\ .
+.NE
 .SH FILES
 .TP 5
 \fB\*d/?/*\fR
 Compiled terminal description database.
+.SH HISTORY
+This utility is not provided by other implementations.
+There is no relevant X/Open or POSIX standard for \fB@TOE@\fP.
+.PP 
+The program name refers to a developer's pun:
+.bP
+\fBtic\fP,
+.bP
+\fBtac\fP (now \fBtack\fP),
+.bP
+\fBtoe\fP.
+.PP
+It replaced a \fB\-T\fP option which was briefly supported by
+the ncurses \fBinfocmp\fP utility in 1995.
+.PP
+The \fB\-a\fP and \fB\-s\fP options were added to 
+\fB@TOE@\fR several years later (2006 and 2011, respectively).
 .SH SEE ALSO
 \fB@TIC@\fR(1M),
 \fB@INFOCMP@\fR(1M),
diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index 7b312904..891b7d55 100644
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 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            *
@@ -84,7 +84,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mouse.c,v 1.181 2018/11/24 17:28:37 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.182 2019/07/20 20:42:43 tom Exp $")
 
 #include 
 
@@ -1103,7 +1103,7 @@ decode_xterm_1005(SCREEN *sp, MEVENT * eventp)
 #else
 			    sp->_ifd,
 #endif
-			    kbuf + grabbed, 1);
+			    (kbuf + grabbed), (size_t) 1);
 	if (res == -1)
 	    break;
 	grabbed += (size_t) res;
@@ -1188,7 +1188,7 @@ read_SGR(SCREEN *sp, SGR_DATA * result)
 #else
 			    sp->_ifd,
 #endif
-			    kbuf + grabbed, 1);
+			    (kbuf + grabbed), (size_t) 1);
 	if (res == -1)
 	    break;
 	if ((grabbed + MAX_KBUF) >= (int) sizeof(kbuf)) {
diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index d2f43022..9e942eaf 100644
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -41,7 +41,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_screen.c,v 1.95 2019/05/04 20:31:31 tom Exp $")
+MODULE_ID("$Id: lib_screen.c,v 1.96 2019/07/20 20:23:21 tom Exp $")
 
 #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
 
@@ -514,13 +514,13 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep)
      * Read the first 4 bytes to determine first if this is an old-format
      * screen-dump, or new-format.
      */
-    if (read_block(&tmp, 4, filep) < 0) {
+    if (read_block(&tmp, (size_t) 4, filep) < 0) {
 	returnWin(0);
     }
     /*
      * If this is a new-format file, and we do not support it, give up.
      */
-    if (!memcmp(&tmp, my_magic, 4)) {
+    if (!memcmp(&tmp, my_magic, (size_t) 4)) {
 #if NCURSES_EXT_PUTWIN
 	if (read_win(&tmp, filep) < 0)
 #endif
@@ -823,7 +823,7 @@ putwin(WINDOW *win, FILE *filep)
 	    attr_t attr;
 
 	    *buffer = '\0';
-	    if (!strncmp(name, "_pad.", 5) && !(win->_flags & _ISPAD)) {
+	    if (!strncmp(name, "_pad.", (size_t) 5) && !(win->_flags & _ISPAD)) {
 		continue;
 	    }
 	    switch (scr_params[y].type) {
diff --git a/ncurses/tinfo/make_hash.c b/ncurses/tinfo/make_hash.c
index 9274b877..09748ee3 100644
--- a/ncurses/tinfo/make_hash.c
+++ b/ncurses/tinfo/make_hash.c
@@ -43,7 +43,7 @@
 
 #include 
 
-MODULE_ID("$Id: make_hash.c,v 1.26 2019/03/10 01:10:15 tom Exp $")
+MODULE_ID("$Id: make_hash.c,v 1.27 2019/07/20 20:14:46 tom Exp $")
 
 /*
  *	_nc_make_hash_table()
@@ -222,16 +222,16 @@ get_type(int type_mask)
 {
     static char result[40];
     unsigned n;
-    strcpy(result, L_PAREN);
+    _nc_STRCPY(result, L_PAREN, sizeof(result));
     for (n = 0; n < 3; ++n) {
 	if ((1 << n) & type_mask) {
 	    if (result[1])
-		strcat(result, "|");
-	    strcat(result, "1<<");
-	    strcat(result, typenames[n]);
+		_nc_STRCAT(result, "|", sizeof(result));
+	    _nc_STRCAT(result, "1<<", sizeof(result));
+	    _nc_STRCAT(result, typenames[n], sizeof(result));
 	}
     }
-    strcat(result, R_PAREN);
+    _nc_STRCAT(result, R_PAREN, sizeof(result));
     return result;
 }
 
diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index 4468bb80..7102a5f2 100644
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -41,7 +41,7 @@
 
 #include 
 
-MODULE_ID("$Id: read_entry.c,v 1.154 2019/03/23 23:47:16 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.155 2019/07/20 20:23:11 tom Exp $")
 
 #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
 
@@ -694,7 +694,7 @@ decode_quickdump(char *target, const char *source)
     char *base = target;
     int result = 0;
 
-    if (!strncmp(source, "b64:", 4)) {
+    if (!strncmp(source, "b64:", (size_t) 4)) {
 	source += 4;
 	while (*source != '\0') {
 	    int bits[4];
@@ -712,7 +712,7 @@ decode_quickdump(char *target, const char *source)
 		}
 	    }
 	}
-    } else if (!strncmp(source, "hex:", 4)) {
+    } else if (!strncmp(source, "hex:", (size_t) 4)) {
 	source += 4;
 	while (*source != '\0') {
 	    int ch = decode_hex(&source);
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 3e610e95..b650ebe3 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190713) unstable; urgency=low
+ncurses6 (6.1+20190720) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
+ -- Thomas E. Dickey   Sat, 20 Jul 2019 06:26:30 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 3e610e95..b650ebe3 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190713) unstable; urgency=low
+ncurses6 (6.1+20190720) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
+ -- Thomas E. Dickey   Sat, 20 Jul 2019 06:26:30 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 9e0476dd..2b4005bc 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190713) unstable; urgency=low
+ncurses6 (6.1+20190720) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
+ -- Thomas E. Dickey   Sat, 20 Jul 2019 06:26:30 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 99781f1b..717e49d2 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.340 2019/07/13 20:42:44 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.342 2019/07/20 10:26:30 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "1"
 !define VERSION_YYYY  "2019"
-!define VERSION_MMDD  "0713"
+!define VERSION_MMDD  "0720"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 2e93ba39..2daa6ebe 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.1
-Release: 20190713
+Release: 20190720
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 2b3dc833..322c7cca 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1
-Release: 20190713
+Release: 20190720
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 4e050f2b..a49c81c1 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.1
-Release: 20190713
+Release: 20190720
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz