From 9193d076200365eeb5ff932acdbbdcc5e452292c Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 14 Jul 2019 00:50:41 +0000 Subject: [PATCH] ncurses 6.1 - patch 20190713 + change reset's behavior for margins to simply clear soft-margins if possible, rather than clearing and then setting them according to the terminal's width (suggested by Thomas Wolff). + correct order of one wbkgd versus start_color call in test/padview.c --- NEWS | 8 +++- VERSION | 2 +- dist.mk | 4 +- doc/html/ada/funcs/T.htm | 2 +- ...erminal_interface-curses-terminfo__adb.htm | 2 +- 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_bkgd.3x.html | 10 ++++- doc/html/man/curs_mouse.3x.html | 13 ++++--- doc/html/man/form.3x.html | 2 +- doc/html/man/infocmp.1m.html | 2 +- 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/term.7.html | 6 +-- doc/html/man/terminfo.5.html | 39 ++++++++++--------- doc/html/man/tic.1m.html | 2 +- doc/html/man/toe.1m.html | 2 +- doc/html/man/tput.1.html | 2 +- doc/html/man/tset.1.html | 2 +- man/curs_bkgd.3x | 10 ++++- man/curs_mouse.3x | 18 +++++---- man/term.7 | 6 +-- man/terminfo.head | 6 +-- man/terminfo.tail | 30 +++++++------- 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 +- package/ncursest.spec | 2 +- progs/reset_cmd.c | 9 +++-- test/padview.c | 14 ++++--- 38 files changed, 132 insertions(+), 99 deletions(-) diff --git a/NEWS b/NEWS index 5e6a2607..c5985433 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.3344 2019/07/06 20:51:46 tom Exp $ +-- $Id: NEWS,v 1.3347 2019/07/13 23:10:57 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,12 @@ 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. +20190713 + + change reset's behavior for margins to simply clear soft-margins if + possible, rather than clearing and then setting them according to the + terminal's width (suggested by Thomas Wolff). + + correct order of one wbkgd versus start_color call in test/padview.c + 20190706 + add domterm -TD + improve comments for recent changes, add alias xterm.js -TD diff --git a/VERSION b/VERSION index 16c38362..3eb49ed5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.1 20190706 +5:0:10 6.1 20190713 diff --git a/dist.mk b/dist.mk index c879c47d..b6c6a5f9 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.1293 2019/07/06 09:10:26 tom Exp $ +# $Id: dist.mk,v 1.1294 2019/07/13 20:42:44 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 = 20190706 +NCURSES_PATCH = 20190713 # 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/ada/funcs/T.htm b/doc/html/ada/funcs/T.htm index 098d0da7..782d38b7 100644 --- a/doc/html/ada/funcs/T.htm +++ b/doc/html/ada/funcs/T.htm @@ -20,8 +20,8 @@
  • tgetnum
  • tgetstr - terminal_interface-curses-termcap.adb:108
  • tgetstr - terminal_interface-curses-termcap.adb:129 -
  • TGoto
  • tgoto +
  • TGoto
  • tigetflag
  • tigetstr - terminal_interface-curses-terminfo.adb:87
  • tigetstr - terminal_interface-curses-terminfo.adb:108 diff --git a/doc/html/ada/terminal_interface-curses-terminfo__adb.htm b/doc/html/ada/terminal_interface-curses-terminfo__adb.htm index ab7488ac..665f8e15 100644 --- a/doc/html/ada/terminal_interface-curses-terminfo__adb.htm +++ b/doc/html/ada/terminal_interface-curses-terminfo__adb.htm @@ -151,7 +151,7 @@ end Get_Number; ------------------------------------------------------------------------------ - procedure Put_String (Str : Terminfo_String; + procedure Put_String (Str : Terminfo_String; affcnt : Natural := 1; putc : putctype := null) is function tputs (str : char_array; diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html index 4c604f08..38cbacf7 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 20190623).
+       This describes ncurses version 6.1 (patch 20190713).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 5dcf61ea..da1e53fc 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 20190623).
+       This describes ncurses version 6.1 (patch 20190713).

    AUTHOR

    diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 122d7cce..a7cc3039 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 20190623).
+       This describes ncurses version 6.1 (patch 20190713).
 
 
 
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index a5bb5bf8..4c772ccd 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -121,6 +121,12 @@
            rent  background,  and  then  adding  attributes from the new back-
            ground.
 
+       If the background's character value is zero, a space is assumed.
+
+       If the terminal does not support  color,  or  if  color  has  not  been
+       started   with   start_color,  the  new  background  character's  color
+       attribute will be ignored.
+

    getbkgd

            The getbkgd function returns  the  given  window's  current  background
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 8923fbfd..1d2a45de 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -347,10 +347,11 @@
 
        Because  there  are  no standard terminal responses that would serve to
        identify terminals which support the xterm mouse protocol, ncurses  as-
-       sumes  that  if  your  $TERM  environment variable contains "xterm", or
-       kmous is defined in the terminal description,  then  the  terminal  may
-       send mouse events.  The kmous capability is checked first, allowing the
-       use of newer xterm mouse protocols.
+       sumes  that  if kmous is defined in the terminal description, or if the
+       terminal description's primary  name  or  aliases  contain  the  string
+       "xterm", then the terminal may send mouse events.  The kmous capability
+       is checked first, allowing the use of newer xterm mouse protocols  such
+       as xterm's private mode 1006.

    SEE ALSO

    diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 26adba18..38091562 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -246,7 +246,7 @@
        curses(3x)  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.1 (patch 20190623).
+       This describes ncurses version 6.1 (patch 20190713).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 739fded2..13cd85ca 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -481,7 +481,7 @@
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.1 (patch 20190623).
+       This describes ncurses version 6.1 (patch 20190713).

    AUTHOR

    diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index b1a1f3fa..139073d5 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 20190623).
+       This describes ncurses version 6.1 (patch 20190713).

    AUTHOR

    diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 46b53479..45cfb808 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 20190623).
+       This describes ncurses version 6.1 (patch 20190713).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 35abcf8f..9e302db7 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 20190623).
+       This describes ncurses version 6.1 (patch 20190713).
 
        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 b40658e3..3e0639e5 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 20190623).
+       This describes ncurses version 6.1 (patch 20190713).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 61940a51..6b01ed93 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 20190623).
+       This describes ncurses version 6.1 (patch 20190713).

    AUTHOR

    diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 2db7090d..82ee8f19 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 20190623).
+       This describes ncurses version 6.1 (patch 20190713).
 
 
 
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index 50c58d1a..2cadcafa 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -1,6 +1,6 @@
 
 
 
@@ -177,7 +177,7 @@
 
        -vb  Use visible bell (flash) rather than beep.
 
-       -w   Wide; terminal is in 132 column mode.
+       -w   Wide; terminal is in 132-column mode.
 
        Conventionally, if your terminal type is a variant intended to  specify
        a  line  height,  that  suffix should go first.  So, for a hypothetical
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 2772b588..05e2f9ce 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -5,7 +5,7 @@
   * Note: this must be run through tbl before nroff.
   * The magic cookie on the first line triggers this under some man programs.
   ****************************************************************************
-  * 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            *
@@ -31,9 +31,9 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.35 2018/07/28 22:29:09 tom Exp @
+  * @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.93 2019/06/01 22:32:15 tom Exp @
+  * @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.
@@ -74,7 +74,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 20190623).
+       ncurses version 6.1 (patch 20190713).

    Terminfo Entry Syntax

    @@ -124,7 +124,7 @@
        ing  up the terminal should have a root name, thus "hp2621".  This name
        should not contain hyphens.  Modes that the hardware can be in, or user
        preferences,  should be indicated by appending a hyphen and a mode suf-
-       fix.  Thus, a vt100 in 132 column mode would be vt100-w.  The following
+       fix.  Thus, a vt100 in 132-column mode would be vt100-w.  The following
        suffixes should be used where possible:
 
             Suffix                  Meaning                   Example
@@ -1902,10 +1902,14 @@
               run the program
                      iprog
 
-              output is1 is2
+              output
+                     is1 and
+                     is2
 
               set the margins using
-                     mgc, smgl and smgr
+                     mgc or
+                     smglp and smgrp or
+                     smgl and smgr
 
               set tabs using
                      tbc and hts
@@ -1913,8 +1917,8 @@
               print the file
                      if
 
-              and finally
-                     output is3.
+              and finally output
+                     is3.
 
        Most initialization is done with is2.  Special terminal  modes  can  be
        set  up  without duplicating strings by putting the common sequences in
@@ -1922,14 +1926,14 @@
 
        A set of sequences that does a harder  reset  from  a  totally  unknown
        state can be given as rs1, rs2, rf and rs3, analogous to is1 , is2 , if
-       and is3 respectively.  These strings are output by  the  reset  program
-       (an  alias of tset), which is used when the terminal gets into a wedged
-       state.  Commands are normally placed in rs1, rs2 rs3  and  rf  only  if
-       they  produce annoying effects on the screen and are not necessary when
-       logging in.  For example, the command to set the vt100  into  80-column
-       mode would normally be part of is2, but it causes an annoying glitch of
-       the screen and is not normally needed since  the  terminal  is  usually
-       already in 80 column mode.
+       and is3 respectively.  These strings are  output  by  reset  option  of
+       tput,  or  by  the reset program (an alias of tset), which is used when
+       the terminal gets into a wedged state.  Commands are normally placed in
+       rs1, rs2 rs3 and rf only if they produce annoying effects on the screen
+       and are not necessary when logging in.  For example, the command to set
+       the  vt100  into  80-column  mode would normally be part of is2, but it
+       causes an annoying glitch of the screen  and  is  not  normally  needed
+       since the terminal is usually already in 80-column mode.
 
        The  reset  program  writes  strings including iprog, etc., in the same
        order as the init program, using rs1, etc., instead of  is1,  etc.   If
@@ -2146,7 +2150,6 @@
                     green     COLOR_GREEN       2     0,max,0
                     yellow    COLOR_YELLOW      3     max,max,0
                     blue      COLOR_BLUE        4     0,0,max
-
                     magenta   COLOR_MAGENTA     5     max,0,max
                     cyan      COLOR_CYAN        6     0,max,max
                     white     COLOR_WHITE       7     max,max,max
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 57ad1e66..035afa1e 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -365,7 +365,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 20190623).
+       This describes ncurses version 6.1 (patch 20190713).

    AUTHOR

    diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 148f767b..829d65a0 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -113,7 +113,7 @@
        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
        minfo(5).
 
-       This describes ncurses version 6.1 (patch 20190623).
+       This describes ncurses version 6.1 (patch 20190713).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 64515c8c..9ff66a3e 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 20190623).
+       This describes ncurses version 6.1 (patch 20190713).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 1acd45a6..3b2a35af 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 20190623).
+       This describes ncurses version 6.1 (patch 20190713).
 
 
 
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index d93bbd4a..c973b98a 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.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_bkgd.3x,v 1.28 2018/12/09 00:45:05 tom Exp $
+.\" $Id: curs_bkgd.3x,v 1.29 2019/07/13 21:01:06 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -112,6 +112,12 @@ and that does not match the color in the current background,
 the library updates only the non-color attributes,
 first removing those which may have come from the current background,
 and then adding attributes from the new background.
+.PP
+If the background's character value is zero, a space is assumed.
+.PP
+If the terminal does not support color,
+or if color has not been started with \fBstart_color\fP,
+the new background character's color attribute will be ignored.
 .SS getbkgd
 .PP
 The \fBgetbkgd\fR function returns the given window's current background
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index f48cb1e8..5e4bc10e 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" 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            *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.50 2018/12/29 23:40:47 tom Exp $
+.\" $Id: curs_mouse.3x,v 1.51 2019/07/13 23:45:12 tom Exp $
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -394,7 +394,7 @@ report sequence will appear in the string read.
 .PP
 Mouse events under xterm will not be detected correctly in a window with
 its keypad bit off, since they are interpreted as a variety of function key.
-Your terminfo description should have \fBkmous\fR set to "\\E[M"
+Your terminfo description should have \fBkmous\fR set to \*(``\\E[M\*(''
 (the beginning of the response from xterm for mouse clicks).
 Other values for \fBkmous\fR are permitted,
 but under the same assumption,
@@ -402,11 +402,13 @@ i.e., it is the beginning of the response.
 .PP
 Because there are no standard terminal responses that would serve to identify
 terminals which support the xterm mouse protocol, \fBncurses\fR assumes that
-if your $TERM environment variable contains \*(``xterm\*('',
-or \fBkmous\fR is defined in
-the terminal description, then the terminal may send mouse events.
-The \fBkmous\fP capability is checked first, allowing the
-use of newer xterm mouse protocols.
+if \fBkmous\fR is defined in the terminal description,
+or if the terminal description's primary name or aliases
+contain the string \*(``xterm\*('',
+then the terminal may send mouse events.
+The \fBkmous\fP capability is checked first,
+allowing the use of newer xterm mouse protocols
+such as xterm's private mode 1006.
 .SH SEE ALSO
 \fBcurses\fR(3X),
 \fBcurs_kernel\fR(3X),
diff --git a/man/term.7 b/man/term.7
index c3e09a1d..24d096ef 100644
--- a/man/term.7
+++ b/man/term.7
@@ -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: term.7,v 1.26 2018/07/28 22:19:56 tom Exp $
+.\" $Id: term.7,v 1.27 2019/07/13 23:17:23 tom Exp $
 .TH term 7
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -190,7 +190,7 @@ Enable status line.
 Use visible bell (flash) rather than beep.
 .TP 5
 \-w
-Wide; terminal is in 132 column mode.
+Wide; terminal is in 132-column mode.
 .PP
 Conventionally, if your terminal type is a variant intended to specify a
 line height, that suffix should go first.
diff --git a/man/terminfo.head b/man/terminfo.head
index 4dfeaa2b..122812ac 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -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: terminfo.head,v 1.35 2018/07/28 22:29:09 tom Exp $
+.\" $Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp $
 .TH terminfo 5 "" "" "File Formats"
 .ds n 5
 .ds d @TERMINFO@
@@ -124,7 +124,7 @@ have a root name, thus \*(``hp2621\*(''.
 This name should not contain hyphens.
 Modes that the hardware can be in, or user preferences, should
 be indicated by appending a hyphen and a mode suffix.
-Thus, a vt100 in 132 column mode would be vt100\-w.
+Thus, a vt100 in 132-column mode would be vt100\-w.
 The following suffixes should be used where possible:
 .PP
 .TS
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 3112cb04..9eeaa4f2 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -1,4 +1,4 @@
-.\" $Id: terminfo.tail,v 1.93 2019/06/01 22:32:15 tom Exp $
+.\" $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.
@@ -1141,14 +1141,17 @@ run the program
 .B iprog
 .TP
 output
-.B is1
-.B is2
+.br
+\fBis1\fP and
+.br
+\fBis2\fP
 .TP
 set the margins using
-.BR mgc ,
-.B smgl
-and
-.B smgr
+\fBmgc\fP or
+.br
+\fBsmglp\fP and \fBsmgrp\fP or
+.br
+\fBsmgl\fP and \fBsmgr\fP
 .TP
 set tabs using
 .B tbc
@@ -1156,11 +1159,10 @@ and
 .B hts
 .TP
 print the file
-.B if
+\fBif\fP
 .TP
-and finally
-output
-.BR is3 .
+and finally output
+\fBis3\fP.
 .RE
 .PP
 Most initialization is done with
@@ -1187,7 +1189,9 @@ analogous to
 and
 .B is3
 respectively.
-These strings are output by the \fB@RESET@\fP program
+These strings are output
+by \fIreset\fP option of \fB@TPUT@\fP,
+or by the \fB@RESET@\fP program
 (an alias of \fB@TSET@\fP),
 which is used when the terminal gets into a wedged state.
 Commands are normally placed in
@@ -1202,7 +1206,7 @@ For example, the command to set the vt100 into 80-column mode would
 normally be part of
 .BR is2 ,
 but it causes an annoying glitch of the screen and is not normally
-needed since the terminal is usually already in 80 column mode.
+needed since the terminal is usually already in 80-column mode.
 .PP
 The \fB@RESET@\fP program writes strings including
 .BR iprog ,
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index cc9d4ad2..3e610e95 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190706) unstable; urgency=low
+ncurses6 (6.1+20190713) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
+ -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index cc9d4ad2..3e610e95 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190706) unstable; urgency=low
+ncurses6 (6.1+20190713) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
+ -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 2f15e2cc..9e0476dd 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190706) unstable; urgency=low
+ncurses6 (6.1+20190713) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
+ -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index ec451c8f..99781f1b 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.339 2019/07/06 09:10:26 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.340 2019/07/13 20:42:44 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  "0706"
+!define VERSION_MMDD  "0713"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index cbdfacb0..2e93ba39 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: 20190706
+Release: 20190713
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 2cad9b1c..2b3dc833 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: 20190706
+Release: 20190713
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 274b999a..4e050f2b 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: 20190706
+Release: 20190713
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/reset_cmd.c b/progs/reset_cmd.c
index c5d96a2e..28829e72 100644
--- a/progs/reset_cmd.c
+++ b/progs/reset_cmd.c
@@ -52,7 +52,7 @@
 #include 
 #endif
 
-MODULE_ID("$Id: reset_cmd.c,v 1.17 2019/05/25 22:36:53 tom Exp $")
+MODULE_ID("$Id: reset_cmd.c,v 1.18 2019/07/13 21:35:13 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -495,6 +495,9 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings)
 				  ? reset_2string
 				  : init_2string);
 
+	if (VALID_STRING(clear_margins)) {
+	    need_flush |= sent_string(clear_margins);
+	} else
 #if defined(set_lr_margin)
 	if (VALID_STRING(set_lr_margin)) {
 	    need_flush |= sent_string(TPARM_2(set_lr_margin, 0,
@@ -509,10 +512,8 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings)
 					      columns - 1));
 	} else
 #endif
-	    if (VALID_STRING(clear_margins)
-		&& VALID_STRING(set_left_margin)
+	    if (VALID_STRING(set_left_margin)
 		&& VALID_STRING(set_right_margin)) {
-	    need_flush |= sent_string(clear_margins);
 	    need_flush |= to_left_margin();
 	    need_flush |= sent_string(set_left_margin);
 	    if (VALID_STRING(parm_right_cursor)) {
diff --git a/test/padview.c b/test/padview.c
index 0445fc74..7bc136d5 100644
--- a/test/padview.c
+++ b/test/padview.c
@@ -28,7 +28,7 @@
 /*
  * clone of view.c, using pads
  *
- * $Id: padview.c,v 1.13 2019/01/21 19:47:07 tom Exp $
+ * $Id: padview.c,v 1.14 2019/07/13 20:41:47 tom Exp $
  */
 
 #include 
@@ -191,7 +191,7 @@ read_file(const char *filename)
 	failed("cannot allocate pad workspace");
     if (try_color) {
 	wattrset(my_pad, COLOR_PAIR(my_pair));
-	wbkgd(my_pad, (chtype) COLOR_PAIR(my_pair));
+	wbkgd(my_pad, (chtype) (' ' | COLOR_PAIR(my_pair)));
     }
 
     /*
@@ -347,18 +347,22 @@ main(int argc, char *argv[])
 	nodelay(stdscr, TRUE);
     idlok(stdscr, TRUE);	/* allow use of insert/delete line */
 
-    my_pad = read_file(fname = argv[optind]);
-
     if (try_color) {
 	if (has_colors()) {
 	    start_color();
 	    init_pair(my_pair, COLOR_WHITE, COLOR_BLUE);
-	    bkgd((chtype) COLOR_PAIR(my_pair));
+	    bkgd((chtype) (' ' | COLOR_PAIR(my_pair)));
 	} else {
 	    try_color = FALSE;
 	}
     }
 
+    /*
+     * Do this after starting color, otherwise the pad's background will be
+     * uncolored after the ncurses 6.1.20181208 fixes.
+     */
+    my_pad = read_file(fname = argv[optind]);
+
     my_row = 0;
     while (!done) {
 	int n, c;
-- 
2.45.0