Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2020-06-27 23:20:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses" Sat Jun 27 23:20:43 2020 rev:175 rq:816433 version:6.2.MACRO Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2020-06-11 14:40:51.844639256 +0200 +++ /work/SRC/openSUSE:Factory/.ncurses.new.3060/ncurses.changes 2020-06-27 23:20:53.909490524 +0200 @@ -1,0 +2,21 @@ +Mon Jun 22 16:58:17 UTC 2020 - Dr. Werner Fink <wer...@suse.de> + +- Run ldconfig local on %buildroot %_lib to get links done (boo#1173222) + +------------------------------------------------------------------- +Mon Jun 15 11:05:42 UTC 2020 - Dr. Werner Fink <wer...@suse.de> + +- Add ncurses patch 20200606 + + add xterm+256color2, xterm+88color2, to deprecate nonstandard usage + in xterm+256color, xterm+88color -TD + + add shifted Linux console keys in linux+sfkeys entry for + screen.linux (report by Alexandre Montaron). + + use vt100+enq in screen (report by Alexandre Montaron). + + add screen.linux-s alias (suggested by Alexandre Montaron). +- Add ncurses patch 20200613 + + update list of functions in ncurses.3x + + move dlclose() call from lib_mouse.c to delscreen() to avoid a case + in the former which could be called from SIGTSTP handler (Debian + #961097). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.ulFku7/_old 2020-06-27 23:20:54.941493918 +0200 +++ /var/tmp/diff_new_pack.ulFku7/_new 2020-06-27 23:20:54.945493930 +0200 @@ -873,6 +873,7 @@ esac done done + /sbin/ldconfig -r %{buildroot}/ -n -v /%{_lib} %if 0 lnk=%{buildroot}%{_libdir}/libtermcap.so echo '/* GNU ld script */' > ${lnk} ++++++ ncurses-5.9-ibm327x.dif ++++++ --- /var/tmp/diff_new_pack.ulFku7/_old 2020-06-27 23:20:55.017494168 +0200 +++ /var/tmp/diff_new_pack.ulFku7/_new 2020-06-27 23:20:55.017494168 +0200 @@ -4,7 +4,7 @@ --- misc/terminfo.src +++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000 -@@ -17124,8 +17124,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -17155,8 +17155,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, ++++++ ncurses-6.2-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-6.2-20200606.patch new/patches/ncurses-6.2-20200606.patch --- old/patches/ncurses-6.2-20200606.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-6.2-20200606.patch 2020-06-15 13:01:18.234151998 +0200 @@ -0,0 +1,333 @@ +# ncurses 6.2 - patch 20200606 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.2 is at +# ftp.gnu.org:/pub/gnu +# +# Patches for ncurses 6.2 can be found at +# ftp://ftp.invisible-island.net/ncurses/6.2 +# http://invisible-mirror.net/archives/ncurses/6.2 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20200606.patch.gz +# patch by Thomas E. Dickey <dic...@invisible-island.net> +# created Sun Jun 7 01:06:32 UTC 2020 +# ------------------------------------------------------------------------------ +# NEWS | 10 +++++ +# VERSION | 2 - +# dist.mk | 4 +- +# misc/terminfo.src | 63 +++++++++++++++++++++++++++++-------- +# 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 - +# 11 files changed, 74 insertions(+), 27 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3502 +--- ncurses-6.2-20200531+/NEWS 2020-05-31 19:41:31.000000000 +0000 ++++ ncurses-6.2-20200606/NEWS 2020-06-07 00:22:03.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3502 2020/05/31 19:41:31 tom Exp $ ++-- $Id: NEWS,v 1.3504 2020/06/07 00:22:03 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,14 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20200606 ++ + add xterm+256color2, xterm+88color2, to deprecate nonstandard usage ++ in xterm+256color, xterm+88color -TD ++ + add shifted Linux console keys in linux+sfkeys entry for ++ screen.linux (report by Alexandre Montaron). ++ + use vt100+enq in screen (report by Alexandre Montaron). ++ + add screen.linux-s alias (suggested by Alexandre Montaron). ++ + 20200531 + + correct configure version-check/warnng for g++ to allow for 10.x + + re-enable "bel" in konsole-base (report by Nia Huang) +Index: VERSION +--- ncurses-6.2-20200531+/VERSION 2020-05-31 18:56:59.000000000 +0000 ++++ ncurses-6.2-20200606/VERSION 2020-06-06 08:52:59.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.2 20200531 ++5:0:10 6.2 20200606 +Index: dist.mk +Prereq: 1.1354 +--- ncurses-6.2-20200531+/dist.mk 2020-05-31 18:56:59.000000000 +0000 ++++ ncurses-6.2-20200606/dist.mk 2020-06-06 08:52:59.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1354 2020/05/31 18:56:59 tom Exp $ ++# $Id: dist.mk,v 1.1355 2020/06/06 08:52:59 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 2 +-NCURSES_PATCH = 20200531 ++NCURSES_PATCH = 20200606 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: misc/terminfo.src +--- ncurses-6.2-20200531+/misc/terminfo.src 2020-05-30 21:37:01.000000000 +0000 ++++ ncurses-6.2-20200606/misc/terminfo.src 2020-06-07 00:16:21.000000000 +0000 +@@ -6,8 +6,8 @@ + # Report bugs and new terminal descriptions to + # bug-ncur...@gnu.org + # +-# $Revision: 1.802 $ +-# $Date: 2020/05/30 21:37:01 $ ++# $Revision: 1.807 $ ++# $Date: 2020/06/07 00:16:21 $ + # + # The original header is preserved below for reference. It is noted that there + # is a "newer" version which differs in some cosmetic details (but actually +@@ -966,9 +966,7 @@ + il=\E[%p1%dL, il1=\E[L, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z, + kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, + kdch1=\E[3~, kend=\E[4~, kf1=\E[[A, kf10=\E[21~, +- kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, +- kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, +- kf19=\E[33~, kf2=\E[[B, kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, ++ kf11=\E[23~, kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, + kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, + khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, + kspd=^Z, nel=\r\n, rc=\E8, rev=\E[7m, ri=\EM, rmam=\E[?7l, +@@ -977,7 +975,14 @@ + %t;2%;%?%p6%t;1%;%?%p9%t;11%;m, + smam=\E[?7h, smir=\E[4h, smul=\E[4m, tbc=\E[3g, + vpa=\E[%i%p1%dd, use=vt102+enq, use=klone+sgr, +- use=ecma+color, ++ use=ecma+color, use=linux+sfkeys, ++ ++linux+decid|ncurses extension for Linux console DECID, ++ u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?6c, u9=\EZ, ++ ++linux+sfkeys|shifted function-keys for Linux console, ++ kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, ++ kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, + + linux-m|Linux console no color, + colors@, pairs@, +@@ -4834,7 +4839,7 @@ + + # 256-colors is a compile-time feature of XFree86 xterm beginning with + # xterm patch #111 (1999/7/10) -TD +-xterm+256color|xterm 256-color feature, ++xterm+256color|original xterm 256-color feature, + ccc, + colors#0x100, pairs#0x10000, + initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%* +@@ -4846,6 +4851,19 @@ + ;%p1%d%;m, + setb@, setf@, + ++# The semicolon separator used in xterm+256color does not follow the ECMA-48 ++# standard. Since patch #282 (in 2012), xterm has supported both the legacy ++# subparameter separator (semicolon) and the standard (colon). ++# ++# The xterm FAQ gives some of the history: ++# https://invisible-island.net/xterm/xterm.faq.html#color_by_number ++xterm+256color2|xterm 256-color feature, ++ setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48 ++ \:5\:%p1%d%;m, ++ setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38\: ++ 5\:%p1%d%;m, ++ use=xterm+256color, ++ + # xterm OSC 104 resets the color palette. Using it as part of xterm+256color + # has the drawback that some of the xterm-alikes which use that building block + # require a different approach to rs1 -TD +@@ -4879,9 +4897,12 @@ + # The default color palette for the 256- and 88-colors are different. A + # given executable will have one palette (perhaps compiled-in). If the program + # supports xterm's control sequence, it can be programmed using initc. +-xterm+88color|xterm 88-color feature, ++xterm+88color|original xterm 88-color feature, + colors#88, pairs#7744, use=xterm+256color, + ++xterm+88color2|xterm 88-color feature, ++ colors#88, pairs#7744, use=xterm+256color2, ++ + # These variants of XFree86 3.9.16 xterm are built as a configure option. + xterm-256color|xterm with 256 colors, + use=xterm+osc104, use=xterm+256color, use=xterm-new, +@@ -4965,6 +4986,15 @@ + # + terminology 0.91 recognizes xterm's original implementation, but does + # nothing useful with it. + ++# Reviewing after ncurses 6.2: ++# + Apple's Terminal.app is unchanged, has no support for direct color: ++# Catalina 10.15.5 Terminal.app 2.10 (433) ++# Mohave 10.14.6 - Terminal.app 2.9.5 (421.2) ++# + Cygwin's mintty 3.1.7 works with colon/semicolon ++# + PuTTY 0.73 works with semicolon ++# + Teraterm 4.105 works with semicolon ++# + terminology 1.7.0 works with colon/semicolon. ++ + # Other variants are possible, e.g., by using more of xterm's indexed color + # palette, though the intrusion of indexed colors on the direct-color space + # would be more noticeable. +@@ -7385,6 +7415,7 @@ + sgr0=\E[m\017, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=, + smso=\E[3m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, + E0=\E(B, S0=\E(%p1%c, use=xterm+alt1049, use=ecma+color, ++ use=vt100+enq, + # The bce and status-line entries are from screen 3.9.13 (and require some + # changes to .screenrc). + screen-bce|VT 100/ANSI X3.64 virtual terminal with bce, +@@ -7525,10 +7556,10 @@ + use=xterm+x11mouse, use=screen+italics, + use=screen+fkeys, use=konsole, + # fix the backspace key +-screen.linux|screen in linux console, ++screen.linux|screen.linux-s|screen in linux console, + bw, +- kbs=^?, kcbt@, use=xterm+x11mouse, use=screen+fkeys, +- use=screen4, ++ kbs=^?, kcbt@, use=linux+sfkeys, use=xterm+x11mouse, ++ use=screen+fkeys, use=screen4, + screen.mlterm|screen in mlterm, + use=xterm+x11mouse, use=screen+fkeys, use=mlterm, + screen.putty|screen in putty, +@@ -20859,7 +20890,6 @@ + rs1=\Ec, rs3=\E[37;40m\E[8], sc=\E7, setab=\E[4%p1%dm, + setaf=\E[3%p1%dm, sgr0=\E[m, smacs=^N, smam=\E[?7h, + smir=\E[4h, smpch=\E[11m, smso=\E[7m, tbc=\E[3g, +- u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?6c, u9=\EZ, + vpa=\E[%i%p1%dd, .VN=\E[?5l, .VR=\E[?5h, .am@, + .ich=\E[%p1%d@, .ich1=\E[@, .ll=\E[99H, .rmcup=, + .rmul=\E[24m, .smcup=\E]R\E]P3FFFF80\E[?8c, +@@ -20872,6 +20902,7 @@ + \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n + \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n + \n\n\n\n\n\n\n\n\n\n, ++ use=linux+decid, + + # 1. Using double-shapes for vt100 graphical chars (eg: mc). + # 2. Native brown color corrected to good yellow color. +@@ -26575,4 +26606,12 @@ + # + re-enable "bel" in konsole-base (report by Nia Huang) + # + add linux-s entry (patch by Alexandre Montaron). + # ++# 2020-06-06 ++# + add xterm+256color2, xterm+88color2, to deprecate nonstandard usage ++# in xterm+256color, xterm+88color -TD ++# + add shifted Linux console keys in linux+sfkeys entry for ++# screen.linux (report by Alexandre Montaron). ++# + use vt100+enq in screen (report by Alexandre Montaron). ++# + add screen.linux-s alias (suggested by Alexandre Montaron). ++# + ######## SHANTIH! SHANTIH! SHANTIH! +Index: package/debian-mingw/changelog +--- ncurses-6.2-20200531+/package/debian-mingw/changelog 2020-05-31 18:56:59.000000000 +0000 ++++ ncurses-6.2-20200606/package/debian-mingw/changelog 2020-06-06 08:52:59.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.2+20200531) unstable; urgency=low ++ncurses6 (6.2+20200606) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sun, 31 May 2020 14:56:59 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 06 Jun 2020 04:52:59 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.2-20200531+/package/debian-mingw64/changelog 2020-05-31 18:56:59.000000000 +0000 ++++ ncurses-6.2-20200606/package/debian-mingw64/changelog 2020-06-06 08:52:59.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.2+20200531) unstable; urgency=low ++ncurses6 (6.2+20200606) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sun, 31 May 2020 14:56:59 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 06 Jun 2020 04:52:59 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.2-20200531+/package/debian/changelog 2020-05-31 18:56:59.000000000 +0000 ++++ ncurses-6.2-20200606/package/debian/changelog 2020-06-06 08:52:59.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.2+20200531) unstable; urgency=low ++ncurses6 (6.2+20200606) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sun, 31 May 2020 14:56:59 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 06 Jun 2020 04:52:59 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.398 +--- ncurses-6.2-20200531+/package/mingw-ncurses.nsi 2020-05-31 18:56:59.000000000 +0000 ++++ ncurses-6.2-20200606/package/mingw-ncurses.nsi 2020-06-06 08:52:59.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.398 2020/05/31 18:56:59 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.399 2020/06/06 08:52:59 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "2" + !define VERSION_YYYY "2020" +-!define VERSION_MMDD "0531" ++!define VERSION_MMDD "0606" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.2-20200531+/package/mingw-ncurses.spec 2020-05-31 18:56:59.000000000 +0000 ++++ ncurses-6.2-20200606/package/mingw-ncurses.spec 2020-06-06 08:52:59.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.2 +-Release: 20200531 ++Release: 20200606 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.2-20200531+/package/ncurses.spec 2020-05-31 18:56:59.000000000 +0000 ++++ ncurses-6.2-20200606/package/ncurses.spec 2020-06-06 08:52:59.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.2 +-Release: 20200531 ++Release: 20200606 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.2-20200531+/package/ncursest.spec 2020-05-31 18:56:59.000000000 +0000 ++++ ncurses-6.2-20200606/package/ncursest.spec 2020-06-06 08:52:59.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.2 +-Release: 20200531 ++Release: 20200606 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-6.2-20200613.patch new/patches/ncurses-6.2-20200613.patch --- old/patches/ncurses-6.2-20200613.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-6.2-20200613.patch 2020-06-15 13:01:29.773937350 +0200 @@ -0,0 +1,982 @@ +# ncurses 6.2 - patch 20200613 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.2 is at +# ftp.gnu.org:/pub/gnu +# +# Patches for ncurses 6.2 can be found at +# ftp://ftp.invisible-island.net/ncurses/6.2 +# http://invisible-mirror.net/archives/ncurses/6.2 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20200613.patch.gz +# patch by Thomas E. Dickey <dic...@invisible-island.net> +# created Sun Jun 14 01:26:43 UTC 2020 +# ------------------------------------------------------------------------------ +# NEWS | 8 ++++ +# VERSION | 2 - +# dist.mk | 4 +- +# doc/html/man/adacurses6-config.1.html | 2 - +# doc/html/man/captoinfo.1m.html | 2 - +# doc/html/man/clear.1.html | 2 - +# doc/html/man/curs_memleaks.3x.html | 16 ++++----- +# 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 | 54 ++++++++++++++++++-------------- +# doc/html/man/ncurses6-config.1.html | 2 - +# doc/html/man/panel.3x.html | 2 - +# doc/html/man/tabs.1.html | 2 - +# doc/html/man/terminfo.5.html | 2 - +# doc/html/man/tic.1m.html | 2 - +# doc/html/man/toe.1m.html | 2 - +# doc/html/man/tput.1.html | 2 - +# doc/html/man/tset.1.html | 2 - +# man/curs_memleaks.3x | 4 +- +# man/ncurses.3x | 38 ++++++++++++++-------- +# ncurses/base/lib_mouse.c | 17 +++++++--- +# ncurses/base/lib_set_term.c | 17 +++++++++- +# ncurses/curses.priv.h | 7 +++- +# ncurses/tinfo/lib_data.c | 7 +++- +# ncurses/tinfo/lib_tparm.c | 26 +++++++-------- +# 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 - +# 34 files changed, 154 insertions(+), 98 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3504 +--- ncurses-6.2-20200606+/NEWS 2020-06-07 00:22:03.000000000 +0000 ++++ ncurses-6.2-20200613/NEWS 2020-06-13 23:29:57.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3504 2020/06/07 00:22:03 tom Exp $ ++-- $Id: NEWS,v 1.3507 2020/06/13 23:29:57 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,12 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20200613 ++ + update list of functions in ncurses.3x ++ + move dlclose() call from lib_mouse.c to delscreen() to avoid a case ++ in the former which could be called from SIGTSTP handler (Debian ++ #961097). ++ + 20200606 + + add xterm+256color2, xterm+88color2, to deprecate nonstandard usage + in xterm+256color, xterm+88color -TD +Index: VERSION +--- ncurses-6.2-20200606+/VERSION 2020-06-06 08:52:59.000000000 +0000 ++++ ncurses-6.2-20200613/VERSION 2020-06-13 09:46:27.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.2 20200606 ++5:0:10 6.2 20200613 +Index: dist.mk +Prereq: 1.1355 +--- ncurses-6.2-20200606+/dist.mk 2020-06-06 08:52:59.000000000 +0000 ++++ ncurses-6.2-20200613/dist.mk 2020-06-13 09:46:27.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1355 2020/06/06 08:52:59 tom Exp $ ++# $Id: dist.mk,v 1.1356 2020/06/13 09:46:27 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 2 +-NCURSES_PATCH = 20200606 ++NCURSES_PATCH = 20200613 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: doc/html/man/adacurses6-config.1.html +--- ncurses-6.2-20200606+/doc/html/man/adacurses6-config.1.html 2020-05-17 01:22:51.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/adacurses6-config.1.html 2020-06-13 23:32:07.000000000 +0000 +@@ -126,7 +126,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + +Index: doc/html/man/captoinfo.1m.html +--- ncurses-6.2-20200606+/doc/html/man/captoinfo.1m.html 2020-05-17 01:22:51.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/captoinfo.1m.html 2020-06-13 23:32:07.000000000 +0000 +@@ -199,7 +199,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/clear.1.html +--- ncurses-6.2-20200606+/doc/html/man/clear.1.html 2020-05-17 01:22:51.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/clear.1.html 2020-06-13 23:32:07.000000000 +0000 +@@ -149,7 +149,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + +Index: doc/html/man/curs_memleaks.3x.html +--- ncurses-6.2-20200606+/doc/html/man/curs_memleaks.3x.html 2020-02-03 01:26:25.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/curs_memleaks.3x.html 2020-06-13 23:38:31.000000000 +0000 +@@ -27,7 +27,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_memleaks.3x,v 1.8 2020/02/02 23:34:34 tom Exp @ ++ * @Id: curs_memleaks.3x,v 1.9 2020/06/13 23:35:34 tom Exp @ + --> + <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> + <HTML> +@@ -68,13 +68,13 @@ + ncurses library. + + Any implementation of curses must not free the memory associated with a +- screen, since (even after calling <STRONG>endwin</STRONG>), it must be available for use +- in the next call to <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>. There are also chunks of memory held +- for performance reasons. That makes it hard to analyze curses applica- +- tions for memory leaks. When using the specially configured debugging +- version of the ncurses library, applications can call functions which +- free those chunks of memory, simplifying the process of memory-leak +- checking. ++ screen, since (even after calling <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG>), it must be available for ++ use in the next call to <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>. There are also chunks of memory ++ held for performance reasons. That makes it hard to analyze curses ap- ++ plications for memory leaks. When using the specially configured de- ++ bugging version of the ncurses library, applications can call functions ++ which free those chunks of memory, simplifying the process of memory- ++ leak checking. + + Some of the functions are named with a "_nc_" prefix because they are + not intended for use in the non-debugging library: +Index: doc/html/man/form.3x.html +--- ncurses-6.2-20200606+/doc/html/man/form.3x.html 2020-05-17 01:22:55.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/form.3x.html 2020-06-13 23:32:10.000000000 +0000 +@@ -247,7 +247,7 @@ + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for detailed + descriptions of the entry points. + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + +Index: doc/html/man/infocmp.1m.html +--- ncurses-6.2-20200606+/doc/html/man/infocmp.1m.html 2020-05-17 01:22:55.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/infocmp.1m.html 2020-06-13 23:32:10.000000000 +0000 +@@ -513,7 +513,7 @@ + + https://invisible-island.net/ncurses/tctest.html + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/infotocap.1m.html +--- ncurses-6.2-20200606+/doc/html/man/infotocap.1m.html 2020-05-17 01:22:55.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/infotocap.1m.html 2020-06-13 23:32:10.000000000 +0000 +@@ -91,7 +91,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/menu.3x.html +--- ncurses-6.2-20200606+/doc/html/man/menu.3x.html 2020-05-17 01:22:56.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/menu.3x.html 2020-06-13 23:32:11.000000000 +0000 +@@ -222,7 +222,7 @@ + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for detailed + descriptions of the entry points. + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + +Index: doc/html/man/ncurses.3x.html +--- ncurses-6.2-20200606+/doc/html/man/ncurses.3x.html 2020-05-17 01:22:56.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/ncurses.3x.html 2020-06-13 23:32:11.000000000 +0000 +@@ -28,7 +28,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: ncurses.3x,v 1.147 2020/03/21 23:38:25 tom Exp @ ++ * @Id: ncurses.3x,v 1.148 2020/06/13 23:25:50 tom Exp @ + --> + <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> + <HTML> +@@ -60,7 +60,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 <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + The <STRONG>ncurses</STRONG> library emulates the curses library of System V Release 4 + UNIX, and XPG4 (X/Open Portability Guide) curses (also known as XSI +@@ -278,25 +278,15 @@ + + + </PRE><H3><a name="h3-Routine-Name-Index">Routine Name Index</a></H3><PRE> +- The following table lists each <STRONG>curses</STRONG> routine and the name of the man- +- ual page on which it is described. Routines flagged with "*" are +- ncurses-specific, not described by XPG4 or present in SVr4. ++ The following table lists the <STRONG>curses</STRONG> routines provided in the "normal" ++ and "wide" libraries and the names of the manual pages on which they ++ are described. Routines flagged with "*" are ncurses-specific, not ++ described by XPG4 or present in SVr4. + + <STRONG>curses</STRONG> Routine Name Manual Page Name + --------------------------------------------- + COLOR_PAIR <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG> + PAIR_NUMBER <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> +- _nc_free_and_exit <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>* +- _nc_freeall <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>* +- _nc_tracebits <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>* +- _traceattr <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>* +- _traceattr2 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>* +- _tracechar <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>* +- _tracechtype <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>* +- _tracechtype2 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>* +- _tracedump <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>* +- _tracef <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>* +- _tracemouse <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>* + add_wch <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG> + add_wchnstr <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG> + add_wchstr <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG> +@@ -313,7 +303,6 @@ + attr_off <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> + attr_on <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> + attr_set <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> +- + attroff <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> + attron <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> + attrset <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> +@@ -324,6 +313,7 @@ + bkgrnd <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG> + bkgrndset <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG> + border <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG> ++ + border_set <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG> + box <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG> + box_set <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG> +@@ -338,6 +328,7 @@ + color_set <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> + copywin <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG> + curs_set <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG> ++ curses_trace <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>* + curses_version <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>* + def_prog_mode <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG> + def_shell_mode <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG> +@@ -358,6 +349,8 @@ + erase <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG> + erasechar <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG> + erasewchar <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG> ++ exit_curses <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>* ++ exit_terminfo <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>* + extended_color_content <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>* + extended_pair_content <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>* + extended_slk_color <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>* +@@ -379,7 +372,6 @@ + getcurx <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>* + getcury <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>* + getmaxx <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>* +- + getmaxy <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>* + getmaxyx <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG> + getmouse <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>* +@@ -387,6 +379,7 @@ + getnstr <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG> + getparx <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>* + getpary <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>* ++ + getparyx <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG> + getstr <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG> + getsyx <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG> +@@ -397,6 +390,7 @@ + has_ic <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG> + has_il <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG> + has_key <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>* ++ has_mouse <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>* + hline <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG> + hline_set <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG> + idcok <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG> +@@ -445,13 +439,13 @@ + key_defined <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>* + key_name <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG> + keybound <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>* +- + keyname <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG> + keyok <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>* + keypad <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG> + killchar <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG> + killwchar <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG> + leaveok <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG> ++ + longname <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG> + mcprint <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>* + meta <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG> +@@ -511,13 +505,13 @@ + mvwaddnwstr <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG> + mvwaddstr <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG> + mvwaddwstr <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG> +- + mvwchgat <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> + mvwdelch <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG> + mvwget_wch <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG> + mvwget_wstr <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG> + mvwgetch <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> + mvwgetn_wstr <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG> ++ + mvwgetnstr <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG> + mvwgetstr <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG> + mvwhline <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG> +@@ -559,6 +553,7 @@ + overlay <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG> + overwrite <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG> + pair_content <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG> ++ pecho_wchar <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>* + pechochar <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG> + pnoutrefresh <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG> + prefresh <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG> +@@ -569,6 +564,7 @@ + raw <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG> + redrawwin <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG> + refresh <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG> ++ reset_color_pairs <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>* + reset_prog_mode <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG> + reset_shell_mode <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG> + resetty <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG> +@@ -577,11 +573,11 @@ + restartterm <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> + ripoffline <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG> + savetty <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG> +- + scanw <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG> + scr_dump <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG> + scr_init <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG> + scr_restore <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG> ++ + scr_set <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG> + scrl <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG> + scroll <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG> +@@ -609,6 +605,7 @@ + slk_restore <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG> + slk_set <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG> + slk_touch <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG> ++ slk_wset <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>* + standend <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> + standout <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> + start_color <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG> +@@ -643,10 +640,10 @@ + use_default_colors <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>* + use_env <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG> + use_extended_names <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>* +- + use_legacy_coding <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>* + use_tioctl <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>* + vid_attr <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> ++ + vid_puts <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> + vidattr <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> + vidputs <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> +@@ -709,10 +706,10 @@ + winch <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG> + winchnstr <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG> + winchstr <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG> +- + winnstr <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG> + winnwstr <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG> + wins_nwstr <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG> ++ + wins_wch <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG> + wins_wstr <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG> + winsch <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG> +@@ -742,6 +739,17 @@ + wvline <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG> + wvline_set <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG> + ++ Depending on the configuration, additional sets of functions may be ++ available: ++ ++ <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG> - curses memory-leak checking ++ ++ <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG> - curses screen-pointer extension ++ ++ <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG> - curses thread support ++ ++ <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG> - curses debugging routines ++ + + </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE> + Routines that return an integer return <STRONG>ERR</STRONG> upon failure and an integer +Index: doc/html/man/ncurses6-config.1.html +--- ncurses-6.2-20200606+/doc/html/man/ncurses6-config.1.html 2020-05-17 01:22:56.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/ncurses6-config.1.html 2020-06-13 23:32:11.000000000 +0000 +@@ -113,7 +113,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + +Index: doc/html/man/panel.3x.html +--- ncurses-6.2-20200606+/doc/html/man/panel.3x.html 2020-05-17 01:22:57.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/panel.3x.html 2020-06-13 23:32:12.000000000 +0000 +@@ -281,7 +281,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/tabs.1.html +--- ncurses-6.2-20200606+/doc/html/man/tabs.1.html 2020-05-17 01:22:57.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/tabs.1.html 2020-06-13 23:32:12.000000000 +0000 +@@ -206,7 +206,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + +Index: doc/html/man/terminfo.5.html +--- ncurses-6.2-20200606+/doc/html/man/terminfo.5.html 2020-05-17 01:22:57.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/terminfo.5.html 2020-06-13 23:32:12.000000000 +0000 +@@ -105,7 +105,7 @@ + have, by specifying how to perform screen operations, and by specifying + padding requirements and initialization sequences. + +- This manual describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This manual describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE> +Index: doc/html/man/tic.1m.html +--- ncurses-6.2-20200606+/doc/html/man/tic.1m.html 2020-05-17 01:22:57.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/tic.1m.html 2020-06-13 23:32:12.000000000 +0000 +@@ -461,7 +461,7 @@ + <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, + <STRONG><A HREF="term.5.html">term(5)</A></STRONG>. <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/toe.1m.html +--- ncurses-6.2-20200606+/doc/html/man/toe.1m.html 2020-05-17 01:22:57.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/toe.1m.html 2020-06-13 23:32:12.000000000 +0000 +@@ -171,7 +171,7 @@ + <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG>ter-</STRONG> + <STRONG><A HREF="terminfo.5.html">minfo(5)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + +Index: doc/html/man/tput.1.html +--- ncurses-6.2-20200606+/doc/html/man/tput.1.html 2020-05-17 01:22:57.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/tput.1.html 2020-06-13 23:32:12.000000000 +0000 +@@ -523,7 +523,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + +Index: doc/html/man/tset.1.html +--- ncurses-6.2-20200606+/doc/html/man/tset.1.html 2020-05-17 01:22:57.000000000 +0000 ++++ ncurses-6.2-20200613/doc/html/man/tset.1.html 2020-06-13 23:32:12.000000000 +0000 +@@ -390,7 +390,7 @@ + <STRONG>csh(1)</STRONG>, <STRONG>sh(1)</STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>tty(4)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, + <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200516). ++ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200613). + + + +Index: man/curs_memleaks.3x +Prereq: 1.8 +--- ncurses-6.2-20200606+/man/curs_memleaks.3x 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.2-20200613/man/curs_memleaks.3x 2020-06-13 23:35:34.000000000 +0000 +@@ -27,7 +27,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_memleaks.3x,v 1.8 2020/02/02 23:34:34 tom Exp $ ++.\" $Id: curs_memleaks.3x,v 1.9 2020/06/13 23:35:34 tom Exp $ + .TH curs_memleaks 3X "" + .ie \n(.g .ds `` \(lq + .el .ds `` `` +@@ -60,7 +60,7 @@ + library. + .PP + Any implementation of curses must not free the memory associated with +-a screen, since (even after calling \fBendwin\fP), it must be available ++a screen, since (even after calling \fBendwin\fP(3X)), it must be available + for use in the next call to \fBrefresh\fP(3X). + There are also chunks of memory held for performance reasons. + That makes it hard to analyze curses applications for memory leaks. +Index: man/ncurses.3x +Prereq: 1.147 +--- ncurses-6.2-20200606+/man/ncurses.3x 2020-03-21 23:38:25.000000000 +0000 ++++ ncurses-6.2-20200613/man/ncurses.3x 2020-06-13 23:25:50.000000000 +0000 +@@ -28,7 +28,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: ncurses.3x,v 1.147 2020/03/21 23:38:25 tom Exp $ ++.\" $Id: ncurses.3x,v 1.148 2020/06/13 23:25:50 tom Exp $ + .hy 0 + .TH ncurses 3X "" + .ie \n(.g .ds `` \(lq +@@ -319,8 +319,9 @@ + .PP + .\" + .SS Routine Name Index +-The following table lists each \fBcurses\fR routine and the name of +-the manual page on which it is described. ++The following table lists the \fBcurses\fR routines provided in ++the \*(``normal\*('' and \*(``wide\*('' libraries and the names of ++the manual pages on which they are described. + Routines flagged with \*(``*\*('' + are ncurses-specific, not described by XPG4 or present in SVr4. + .PP +@@ -332,17 +333,6 @@ + = + COLOR_PAIR/\fBcurs_color\fR(3X) + PAIR_NUMBER/\fBcurs_attr\fR(3X) +-_nc_free_and_exit/\fBcurs_memleaks\fR(3X)* +-_nc_freeall/\fBcurs_memleaks\fR(3X)* +-_nc_tracebits/\fBcurs_trace\fR(3X)* +-_traceattr/\fBcurs_trace\fR(3X)* +-_traceattr2/\fBcurs_trace\fR(3X)* +-_tracechar/\fBcurs_trace\fR(3X)* +-_tracechtype/\fBcurs_trace\fR(3X)* +-_tracechtype2/\fBcurs_trace\fR(3X)* +-_tracedump/\fBcurs_trace\fR(3X)* +-_tracef/\fBcurs_trace\fR(3X)* +-_tracemouse/\fBcurs_trace\fR(3X)* + add_wch/\fBcurs_add_wch\fR(3X) + add_wchnstr/\fBcurs_add_wchstr\fR(3X) + add_wchstr/\fBcurs_add_wchstr\fR(3X) +@@ -383,6 +373,7 @@ + color_set/\fBcurs_attr\fR(3X) + copywin/\fBcurs_overlay\fR(3X) + curs_set/\fBcurs_kernel\fR(3X) ++curses_trace/\fBcurs_trace\fR(3X)* + curses_version/\fBcurs_extend\fR(3X)* + def_prog_mode/\fBcurs_kernel\fR(3X) + def_shell_mode/\fBcurs_kernel\fR(3X) +@@ -403,6 +394,8 @@ + erase/\fBcurs_clear\fR(3X) + erasechar/\fBcurs_termattrs\fR(3X) + erasewchar/\fBcurs_termattrs\fR(3X) ++exit_curses/\fBcurs_memleaks\fR(3X)* ++exit_terminfo/\fBcurs_memleaks\fR(3X)* + extended_color_content/\fBcurs_color\fR(3X)* + extended_pair_content/\fBcurs_color\fR(3X)* + extended_slk_color/\fBcurs_slk\fR(3X)* +@@ -441,6 +434,7 @@ + has_ic/\fBcurs_termattrs\fR(3X) + has_il/\fBcurs_termattrs\fR(3X) + has_key/\fBcurs_getch\fR(3X)* ++has_mouse/\fBcurs_mouse\fR(3X)* + hline/\fBcurs_border\fR(3X) + hline_set/\fBcurs_border_set\fR(3X) + idcok/\fBcurs_outopts\fR(3X) +@@ -601,6 +595,7 @@ + overlay/\fBcurs_overlay\fR(3X) + overwrite/\fBcurs_overlay\fR(3X) + pair_content/\fBcurs_color\fR(3X) ++pecho_wchar/\fBcurs_pad\fR(3X)* + pechochar/\fBcurs_pad\fR(3X) + pnoutrefresh/\fBcurs_pad\fR(3X) + prefresh/\fBcurs_pad\fR(3X) +@@ -611,6 +606,7 @@ + raw/\fBcurs_inopts\fR(3X) + redrawwin/\fBcurs_refresh\fR(3X) + refresh/\fBcurs_refresh\fR(3X) ++reset_color_pairs/\fBcurs_color\fR(3X)* + reset_prog_mode/\fBcurs_kernel\fR(3X) + reset_shell_mode/\fBcurs_kernel\fR(3X) + resetty/\fBcurs_kernel\fR(3X) +@@ -650,6 +646,7 @@ + slk_restore/\fBcurs_slk\fR(3X) + slk_set/\fBcurs_slk\fR(3X) + slk_touch/\fBcurs_slk\fR(3X) ++slk_wset/\fBcurs_slk\fR(3X)* + standend/\fBcurs_attr\fR(3X) + standout/\fBcurs_attr\fR(3X) + start_color/\fBcurs_color\fR(3X) +@@ -781,6 +778,19 @@ + wvline/\fBcurs_border\fR(3X) + wvline_set/\fBcurs_border_set\fR(3X) + .TE ++.PP ++Depending on the configuration, ++additional sets of functions may be available: ++.RS 3 ++.TP 5 ++\fBcurs_memleaks\fP(3X) - curses memory-leak checking ++.TP 5 ++\fBcurs_sp_funcs\fP(3X) - curses screen-pointer extension ++.TP 5 ++\fBcurs_threads\fP(3X) - curses thread support ++.TP 5 ++\fBcurs_trace\fP(3X) - curses debugging routines ++.RE + .SH RETURN VALUE + Routines that return an integer return \fBERR\fR upon failure and an + integer value other than \fBERR\fR upon successful completion, unless +Index: ncurses/base/lib_mouse.c +Prereq: 1.190 +--- ncurses-6.2-20200606+/ncurses/base/lib_mouse.c 2020-05-27 23:55:32.000000000 +0000 ++++ ncurses-6.2-20200613/ncurses/base/lib_mouse.c 2020-06-13 21:05:02.000000000 +0000 +@@ -85,7 +85,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_mouse.c,v 1.190 2020/05/27 23:55:32 tom Exp $") ++MODULE_ID("$Id: lib_mouse.c,v 1.191 2020/06/13 21:05:02 tom Exp $") + + #include <tic.h> + +@@ -487,8 +487,6 @@ + T(("unload GPM library")); + sp->_mouse_gpm_loaded = FALSE; + sp->_mouse_fd = -1; +- dlclose(sp->_dlopen_gpm); +- sp->_dlopen_gpm = 0; + } + } + +@@ -496,7 +494,14 @@ + load_gpm_library(SCREEN *sp) + { + sp->_mouse_gpm_found = FALSE; +- if ((sp->_dlopen_gpm = dlopen(LIBGPM_SONAME, my_RTLD)) != 0) { ++ ++ /* ++ * If we already had a successful dlopen, reuse it. ++ */ ++ if (sp->_dlopen_gpm != 0) { ++ sp->_mouse_gpm_found = TRUE; ++ sp->_mouse_gpm_loaded = TRUE; ++ } else if ((sp->_dlopen_gpm = dlopen(LIBGPM_SONAME, my_RTLD)) != 0) { + #if (defined(__GNUC__) && (__GNUC__ >= 5)) || defined(__clang__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" +@@ -510,13 +515,15 @@ + #endif + T(("GPM initialization failed: %s", dlerror())); + unload_gpm_library(sp); ++ dlclose(sp->_dlopen_gpm); ++ sp->_dlopen_gpm = 0; + } else { + sp->_mouse_gpm_found = TRUE; + sp->_mouse_gpm_loaded = TRUE; + } + } + } +-#endif ++#endif /* HAVE_LIBDL */ + + static bool + enable_gpm_mouse(SCREEN *sp, bool enable) +Index: ncurses/base/lib_set_term.c +Prereq: 1.171 +--- ncurses-6.2-20200606+/ncurses/base/lib_set_term.c 2020-05-23 19:13:12.000000000 +0000 ++++ ncurses-6.2-20200613/ncurses/base/lib_set_term.c 2020-06-13 21:38:43.000000000 +0000 +@@ -44,10 +44,17 @@ + #include <curses.priv.h> + #include <tic.h> + ++#if USE_GPM_SUPPORT ++#ifdef HAVE_LIBDL ++/* use dynamic loader to avoid linkage dependency */ ++#include <dlfcn.h> ++#endif ++#endif ++ + #undef CUR + #define CUR SP_TERMTYPE + +-MODULE_ID("$Id: lib_set_term.c,v 1.171 2020/05/23 19:13:12 tom Exp $") ++MODULE_ID("$Id: lib_set_term.c,v 1.173 2020/06/13 21:38:43 tom Exp $") + + #ifdef USE_TERM_DRIVER + #define MaxColors InfoOf(sp).maxcolors +@@ -197,6 +204,14 @@ + if (_nc_find_prescr() == sp) { + _nc_forget_prescr(); + } ++#if USE_GPM_SUPPORT ++#ifdef HAVE_LIBDL ++ if (sp->_dlopen_gpm != 0) { ++ dlclose(sp->_dlopen_gpm); ++ sp->_dlopen_gpm = 0; ++ } ++#endif ++#endif /* USE_GPM_SUPPORT */ + free(sp); + + /* +Index: ncurses/curses.priv.h +Prereq: 1.628 +--- ncurses-6.2-20200606+/ncurses/curses.priv.h 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.2-20200613/ncurses/curses.priv.h 2020-06-13 21:58:00.000000000 +0000 +@@ -35,7 +35,7 @@ + ****************************************************************************/ + + /* +- * $Id: curses.priv.h,v 1.628 2020/02/02 23:34:34 tom Exp $ ++ * $Id: curses.priv.h,v 1.629 2020/06/13 21:58:00 tom Exp $ + * + * curses.priv.h + * +@@ -953,6 +953,11 @@ + time_t dbd_time; /* cache last updated */ + ITERATOR_VARS dbd_vars[dbdLAST]; + ++#if HAVE_TSEARCH ++ void *cached_tparm; ++ int count_tparm; ++#endif /* HAVE_TSEARCH */ ++ + #ifdef USE_TERM_DRIVER + int (*term_driver)(struct DriverTCB*, const char*, int*); + #endif +Index: ncurses/tinfo/lib_data.c +Prereq: 1.80 +--- ncurses-6.2-20200606+/ncurses/tinfo/lib_data.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.2-20200613/ncurses/tinfo/lib_data.c 2020-06-13 22:01:14.000000000 +0000 +@@ -43,7 +43,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_data.c,v 1.80 2020/02/02 23:34:34 tom Exp $") ++MODULE_ID("$Id: lib_data.c,v 1.81 2020/06/13 22:01:14 tom Exp $") + + /* + * OS/2's native linker complains if we don't initialize public data when +@@ -155,6 +155,11 @@ + 0, /* dbd_time */ + { { 0, 0 } }, /* dbd_vars */ + ++#if HAVE_TSEARCH ++ NULL, /* cached_tparm */ ++ 0, /* count_tparm */ ++#endif /* HAVE_TSEARCH */ ++ + #ifdef USE_TERM_DRIVER + 0, /* term_driver */ + #endif +Index: ncurses/tinfo/lib_tparm.c +Prereq: 1.126 +--- ncurses-6.2-20200606+/ncurses/tinfo/lib_tparm.c 2020-05-31 00:02:03.000000000 +0000 ++++ ncurses-6.2-20200613/ncurses/tinfo/lib_tparm.c 2020-06-13 21:59:52.000000000 +0000 +@@ -53,7 +53,7 @@ + #include <ctype.h> + #include <tic.h> + +-MODULE_ID("$Id: lib_tparm.c,v 1.126 2020/05/31 00:02:03 tom Exp $") ++MODULE_ID("$Id: lib_tparm.c,v 1.127 2020/06/13 21:59:52 tom Exp $") + + /* + * char * +@@ -135,8 +135,8 @@ + } TPARM_DATA; + + #if HAVE_TSEARCH +-static void *cached_tparm; +-static int count_tparm; ++#define MyCache _nc_globals.cached_tparm ++#define MyCount _nc_globals.count_tparm + #if NO_LEAKS + static int which_tparm; + static TPARM_DATA **delete_tparm; +@@ -172,20 +172,20 @@ + _nc_free_tparm(void) + { + #if HAVE_TSEARCH +- if (count_tparm != 0) { +- delete_tparm = typeMalloc(TPARM_DATA *, count_tparm); ++ if (MyCount != 0) { ++ delete_tparm = typeMalloc(TPARM_DATA *, MyCount); + which_tparm = 0; +- twalk(cached_tparm, visit_nodes); +- for (which_tparm = 0; which_tparm < count_tparm; ++which_tparm) { ++ twalk(MyCache, visit_nodes); ++ for (which_tparm = 0; which_tparm < MyCount; ++which_tparm) { + TPARM_DATA *ptr = delete_tparm[which_tparm]; +- tdelete(ptr, &cached_tparm, cmp_format); ++ tdelete(ptr, &MyCache, cmp_format); + free((char *) ptr->format); + free(ptr); + } + which_tparm = 0; +- twalk(cached_tparm, visit_nodes); ++ twalk(MyCache, visit_nodes); + FreeAndNull(delete_tparm); +- count_tparm = 0; ++ MyCount = 0; + which_tparm = 0; + } + #endif +@@ -555,7 +555,7 @@ + void *ft; + + result->format = string; +- if ((ft = tfind(result, &cached_tparm, cmp_format)) != 0) { ++ if ((ft = tfind(result, &MyCache, cmp_format)) != 0) { + fs = *(TPARM_DATA **) ft; + *result = *fs; + } else +@@ -589,8 +589,8 @@ + if ((fs = typeCalloc(TPARM_DATA, 1)) != 0) { + *fs = *result; + if ((fs->format = strdup(string)) != 0) { +- if ((ft = tsearch(fs, &cached_tparm, cmp_format)) != 0) { +- ++count_tparm; ++ if ((ft = tsearch(fs, &MyCache, cmp_format)) != 0) { ++ ++MyCount; + } else { + rc = ERR; + } +Index: package/debian-mingw/changelog +--- ncurses-6.2-20200606+/package/debian-mingw/changelog 2020-06-06 08:52:59.000000000 +0000 ++++ ncurses-6.2-20200613/package/debian-mingw/changelog 2020-06-13 09:46:27.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.2+20200606) unstable; urgency=low ++ncurses6 (6.2+20200613) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 06 Jun 2020 04:52:59 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 13 Jun 2020 05:46:27 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.2-20200606+/package/debian-mingw64/changelog 2020-06-06 08:52:59.000000000 +0000 ++++ ncurses-6.2-20200613/package/debian-mingw64/changelog 2020-06-13 09:46:27.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.2+20200606) unstable; urgency=low ++ncurses6 (6.2+20200613) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 06 Jun 2020 04:52:59 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 13 Jun 2020 05:46:27 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.2-20200606+/package/debian/changelog 2020-06-06 08:52:59.000000000 +0000 ++++ ncurses-6.2-20200613/package/debian/changelog 2020-06-13 09:46:27.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.2+20200606) unstable; urgency=low ++ncurses6 (6.2+20200613) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 06 Jun 2020 04:52:59 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 13 Jun 2020 05:46:27 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.399 +--- ncurses-6.2-20200606+/package/mingw-ncurses.nsi 2020-06-06 08:52:59.000000000 +0000 ++++ ncurses-6.2-20200613/package/mingw-ncurses.nsi 2020-06-13 09:46:27.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.399 2020/06/06 08:52:59 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.400 2020/06/13 09:46:27 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "2" + !define VERSION_YYYY "2020" +-!define VERSION_MMDD "0606" ++!define VERSION_MMDD "0613" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.2-20200606+/package/mingw-ncurses.spec 2020-06-06 08:52:59.000000000 +0000 ++++ ncurses-6.2-20200613/package/mingw-ncurses.spec 2020-06-13 09:46:27.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.2 +-Release: 20200606 ++Release: 20200613 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.2-20200606+/package/ncurses.spec 2020-06-06 08:52:59.000000000 +0000 ++++ ncurses-6.2-20200613/package/ncurses.spec 2020-06-13 09:46:27.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.2 +-Release: 20200606 ++Release: 20200613 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.2-20200606+/package/ncursest.spec 2020-06-06 08:52:59.000000000 +0000 ++++ ncurses-6.2-20200613/package/ncursest.spec 2020-06-13 09:46:27.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.2 +-Release: 20200606 ++Release: 20200613 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz ++++++ ncurses-6.2.dif ++++++ --- /var/tmp/diff_new_pack.ulFku7/_old 2020-06-27 23:20:55.569495983 +0200 +++ /var/tmp/diff_new_pack.ulFku7/_new 2020-06-27 23:20:55.569495983 +0200 @@ -411,7 +411,7 @@ gn, use=dumb, lpr|printer|line printer, OTbs, hc, os, -@@ -1010,9 +1012,15 @@ linux-c|linux console 1.3.6+ for older n +@@ -1015,9 +1017,15 @@ linux-c|linux console 1.3.6+ for older n # The 2.2.x kernels add a private mode that sets the cursor type; use that to # get a block cursor for cvvis. # reported by Frank Heckenbach <fr...@g-n-u.de>. @@ -428,7 +428,7 @@ # Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here: # http://lkml.iu.edu/hypermail/linux/kernel/0602.2/0738.html -@@ -1027,6 +1035,7 @@ linux2.6|linux 2.6.x console, +@@ -1032,6 +1040,7 @@ linux2.6|linux 2.6.x console, acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwx xyyzz{{||}c~~, enacs=\E)0, rmacs=^O, @@ -436,7 +436,7 @@ sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5 %t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, use=linux2.2, -@@ -2507,6 +2516,7 @@ vt132|DEC vt132, +@@ -2512,6 +2521,7 @@ vt132|DEC vt132, # at the top of the keyboard. The "DO" key is used as F10 to avoid conflict # with the key marked (ESC) on the vt220. See vt220d for an alternate mapping. # PF1--PF4 are used as F1--F4. @@ -444,7 +444,7 @@ # # added msgr -TD vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, -@@ -2517,7 +2527,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e +@@ -2522,7 +2532,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l, clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C, @@ -453,7 +453,7 @@ dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED$<20/>, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B, -@@ -2678,6 +2688,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. +@@ -2683,6 +2693,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. # to SMASH the 1k-barrier... # From: Adam Thompson <athom...@pangea.ca> Sept 10 1995 # (vt320: uncommented <fsl> --esr) @@ -461,7 +461,7 @@ vt320|vt300|dec vt320 7 bit terminal, am, hs, mir, msgr, xenl, cols#80, lines#24, wsl#80, -@@ -2687,7 +2698,7 @@ vt320|vt300|dec vt320 7 bit terminal, +@@ -2692,7 +2703,7 @@ vt320|vt300|dec vt320 7 bit terminal, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -470,7 +470,7 @@ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, -@@ -4113,6 +4124,7 @@ mintty+common|shared capabilities for mi +@@ -4118,6 +4129,7 @@ mintty+common|shared capabilities for mi # retrieving the window title, and for setting the window size (i.e., using # "resize -s"), though it does not pass SIGWINCH to the application if the # user resizes the window with the mouse. @@ -478,7 +478,7 @@ teraterm2.3|Tera Term Pro, km, ncv#43, vt@, -@@ -4121,7 +4133,7 @@ teraterm2.3|Tera Term Pro, +@@ -4126,7 +4138,7 @@ teraterm2.3|Tera Term Pro, \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J, cnorm=\E[?25h, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, @@ -487,7 +487,7 @@ dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~, -@@ -4454,6 +4466,7 @@ xterm-mono|monochrome xterm, +@@ -4459,6 +4471,7 @@ xterm-mono|monochrome xterm, use=xterm-r6, # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up. # The name has been changed and some aliases have been removed. @@ -495,7 +495,7 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), OTbs, am, bce, km, mir, msgr, xenl, XT, cols#80, it#8, lines#24, ncv@, -@@ -4463,7 +4476,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -4468,7 +4481,7 @@ xterm-xf86-v32|xterm terminal emulator ( csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -504,7 +504,7 @@ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, -@@ -5130,8 +5143,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -5160,8 +5173,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -531,7 +531,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -5476,7 +5507,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -5506,7 +5537,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -540,7 +540,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -5727,10 +5758,14 @@ mgt|Multi GNOME Terminal, +@@ -5757,10 +5788,14 @@ mgt|Multi GNOME Terminal, #### KDE # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce # or not is debatable). @@ -556,7 +556,7 @@ # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -5945,14 +5980,14 @@ mlterm3|multi lingual terminal emulator, +@@ -5975,14 +6010,14 @@ mlterm3|multi lingual terminal emulator, mlterm2|multi lingual terminal emulator, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, colors#8, cols#80, it#8, lines#24, pairs#64, @@ -574,7 +574,7 @@ home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?, -@@ -6009,6 +6044,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -6039,6 +6074,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 # rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM. # Since rxvt is not really compatible with xterm, it should be configured as # "rxvt" or "rxvt-color". @@ -582,7 +582,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -6020,13 +6056,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6050,13 +6086,14 @@ rxvt-basic|rxvt terminal base (X Window clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, @@ -600,7 +600,7 @@ rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, -@@ -6037,7 +6074,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6067,7 +6104,7 @@ rxvt-basic|rxvt terminal base (X Window %p9%t\016%e\017%;, sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq, @@ -609,7 +609,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -6120,8 +6157,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6150,8 +6187,8 @@ rxvt-basic|rxvt terminal base (X Window # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD rxvt+pcfkeys|fragment for PC-style fkeys, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, @@ -620,7 +620,7 @@ kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, -@@ -6212,6 +6249,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6242,6 +6279,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -659,7 +659,7 @@ # This variant is supposed to work with rxvt 2.7.7 when compiled with # NO_BRIGHTCOLOR defined. rxvt needs more work... rxvt-16color|rxvt with 16 colors like aixterm, -@@ -6258,7 +6327,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -6288,7 +6357,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -668,7 +668,7 @@ # Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT # but does otherwise follow the rxvt+pcfkeys model -TD # remove nonworking flash -TD -@@ -6272,12 +6341,12 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -6302,12 +6371,12 @@ Eterm|Eterm-color|Eterm with xterm-style csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -683,7 +683,7 @@ kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=, -@@ -7230,7 +7299,7 @@ pty|4bsd pseudo teletype, +@@ -7260,7 +7329,7 @@ pty|4bsd pseudo teletype, # https://github.com/emacs-mirror/emacs/blob/master/lisp/term.el # # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -692,7 +692,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -7243,6 +7312,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -7273,6 +7342,13 @@ eterm|gnu emacs term.el terminal emulati rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, smul=\E[4m, @@ -706,7 +706,7 @@ # The codes supported by the term.el terminal emulation in GNU Emacs 22.2 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, -@@ -7371,7 +7447,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -7401,7 +7477,7 @@ screen|VT 100/ANSI X3.64 virtual termina dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, @@ -715,7 +715,7 @@ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, -@@ -7492,6 +7568,13 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -7523,6 +7599,13 @@ screen.xterm-xfree86|screen.xterm-new|sc use=xterm+x11mouse, use=xterm-new, #:screen.xterm|screen for modern xterm, #: use=screen.xterm-new, @@ -729,7 +729,7 @@ # xterm-r6 does not really support khome/kend unless it is propped up by # the translations resource. screen.xterm-r6|screen customized for X11R6 xterm, -@@ -7579,7 +7662,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -7610,7 +7693,7 @@ screen2|old VT 100/ANSI X3.64 virtual te cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL, @@ -738,7 +738,7 @@ kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, -@@ -9482,7 +9565,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -9513,7 +9596,7 @@ hp700-wy|HP700/41 emulating wyse30, ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, @@ -747,7 +747,7 @@ am, da, db, xhp, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, -@@ -12713,6 +12796,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -12744,6 +12827,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit # at support for the VT320 itself. # Please send changes with explanations to bug-gnu-em...@prep.ai.mit.edu. # (vt320-k3: I added <rmam>/<smam> based on the init string -- esr) @@ -755,7 +755,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulation, am, eslok, hs, km, mir, msgr, xenl, cols#80, it#8, lines#49, pb#9600, vt#3, -@@ -12722,7 +12806,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -12753,7 +12837,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -764,7 +764,7 @@ dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K, flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[ ?5l, -@@ -17134,7 +17218,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -17165,7 +17249,7 @@ ibm3101|i3101|IBM 3101-10, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH, @@ -773,7 +773,7 @@ is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%; %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t -@@ -17392,7 +17476,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -17423,7 +17507,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De tbc=\E[3g, use=ecma+index, # "Megapel" refers to the display adapter, which was used with the IBM RT # aka IBM 6150. @@ -795,7 +795,7 @@ $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ --- ncurses/curses.priv.h +++ ncurses/curses.priv.h 2020-03-09 09:17:28.753300070 +0000 -@@ -2245,6 +2245,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec +@@ -2250,6 +2250,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t); extern NCURSES_EXPORT(int) _nc_access (const char *, int);