ncurses 6.0 - patch 20170827

+ fix a bug in repeat_char logic (cf: 20170729, report by Chris Clayton).

diff --git a/NEWS b/NEWS
index bd187cac0d6914f1f030b6368f3585915f276f86..27e0e24006a17614ae7a21317b01a39f9fb84589 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.2935 2017/08/26 21:33:48 tom Exp $
+-- $Id: NEWS,v 1.2937 2017/08/27 18:35:58 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,9 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20170827
+       + fix a bug in repeat_char logic (cf: 20170729, report by Chris Clayton).
+

 20170826
        + fixes for "iterm2" (report by Leonardo Brondani Schenkel) -TD
        + corrected a warning from tic about keys which are the same, to skip
 20170826
        + fixes for "iterm2" (report by Leonardo Brondani Schenkel) -TD
        + corrected a warning from tic about keys which are the same, to skip

diff --git a/VERSION b/VERSION
index 2d2d14caa93cfc7b6dc0d8731a6ce0703f6c2b85..cdd3e048bb35cd6d709cdf9d9b274932fecd2638 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:9  6.0     20170826
+5:0:9  6.0     20170827

diff --git a/dist.mk b/dist.mk
index 2c704721946e35e4d0ab90a3c5d8287454fd5ad4..0da7f27084fd7078692ebb1d8d2de06d487bed1e 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.1179 2017/08/20 15:33:41 tom Exp $
+# $Id: dist.mk,v 1.1180 2017/08/27 15:37:47 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # 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
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 0

-NCURSES_PATCH = 20170826
+NCURSES_PATCH = 20170827

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c
index 14fdd7bd1233893e62eeac2d1e71add2a9b163ea..f86ee7292f78c78c7568b9a62c25a884faf6fc96 100644 (file)
--- a/ncurses/tty/tty_update.c
+++ b/ncurses/tty/tty_update.c
@@ -84,7 +84,7 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-MODULE_ID("$Id: tty_update.c,v 1.294 2017/07/31 21:06:04 tom Exp $")
+MODULE_ID("$Id: tty_update.c,v 1.296 2017/08/27 19:40:17 tom Exp $")

 
 /*
  * This define controls the line-breakout optimization.  Every once in a
 
 /*
  * This define controls the line-breakout optimization.  Every once in a


@@ -668,7 +668,9 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
                }
            } else if (repeat_char != 0 &&
 #if USE_WIDEC_SUPPORT
                }
            } else if (repeat_char != 0 &&
 #if USE_WIDEC_SUPPORT

-                      (CharOf(ntext0) < ACS_LEN) &&
+                      (!SP_PARM->_screen_unicode &&
+                       ((AttrOf(ntext0) & A_ALTCHARSET) == 0 ||
+                        (CharOf(ntext0) < ACS_LEN))) &&

 #endif
                       runcount > SP_PARM->_rep_cost) {
                NCURSES_CH_T temp;
 #endif
                       runcount > SP_PARM->_rep_cost) {
                NCURSES_CH_T temp;


@@ -682,10 +684,11 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
                UpdateAttrs(SP_PARM, ntext0);
                temp = ntext0;
                if ((AttrOf(temp) & A_ALTCHARSET) &&
                UpdateAttrs(SP_PARM, ntext0);
                temp = ntext0;
                if ((AttrOf(temp) & A_ALTCHARSET) &&

-                   SP_PARM->_acs_map != 0) {
+                   SP_PARM->_acs_map != 0 &&
+                   (SP_PARM->_acs_map[CharOf(temp)] & A_CHARTEXT) != 0) {

                    SetChar(temp,
                    SetChar(temp,

-                           SP_PARM->_acs_map[CharOf(temp)],
-                           AttrOf(temp) | A_ALTCHARSET);
+                           (SP_PARM->_acs_map[CharOf(ntext0)] & A_CHARTEXT),
+                           AttrOf(ntext0) | A_ALTCHARSET);

                }
                NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
                                        TPARM_2(repeat_char,
                }
                NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
                                        TPARM_2(repeat_char,

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 78a2b83738a2bcd0cf04bb4e4932314413c94e2d..32c40df284d6eee6454c52b239775bf8fa5c3b01 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170826) unstable; urgency=low
+ncurses6 (6.0+20170827) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 20 Aug 2017 11:33:41 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 27 Aug 2017 11:37:47 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 78a2b83738a2bcd0cf04bb4e4932314413c94e2d..32c40df284d6eee6454c52b239775bf8fa5c3b01 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170826) unstable; urgency=low
+ncurses6 (6.0+20170827) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 20 Aug 2017 11:33:41 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 27 Aug 2017 11:37:47 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index c452749cd14f0ade45717bc990eb224d7e37f879..2f880e57625481140455db0a5fa3719953bad895 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170826) unstable; urgency=low
+ncurses6 (6.0+20170827) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 20 Aug 2017 11:33:41 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 27 Aug 2017 11:37:47 -0400

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 44537f8b50920be0679faf50e399d5d371872709..c0d4a4bc79e68ceb8dc4bf4917a5dd70a60a9e01 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.227 2017/08/20 15:33:41 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.228 2017/08/27 15:37:47 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2017"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2017"\r

-!define VERSION_MMDD  "0826"\r
+!define VERSION_MMDD  "0827"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 5fb249f3d70bd58ab50b9cc42292efdc5a2865be..c21b81fece9f01972d91d91df0da4e240ab1b1ca 100644 (file)
--- 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
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0

-Release: 20170826
+Release: 20170827

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 88c68f854afd024d55be1cf4c66be0d43231de74..baf94fa8dcb73c239a7f2c493206a9f58276a15f 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0

-Release: 20170826
+Release: 20170827

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz