diff --git a/NEWS b/NEWS index 60afd836..8e43b452 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.3192 2018/09/23 08:41:44 tom Exp $ +-- $Id: NEWS,v 1.3194 2018/09/30 00:33:46 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,18 @@ 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. +20180929 + + fix typo in tvi955 -TD + + corrected acsc for regent60 -TD + + add alias n7900 -TD + + corrected acsc for tvi950 -TD + + remove bogus kf0 from tvi950 -TD + + added function-key definitions to agree with Televideo 950 manual -TD + + add bel to tvi950 -TD + + add shifted function-keys to regent60 -TD + + renumber regent40 function-keys to match manual -TD + + add cd (clr_eos) to adds200 -TD + 20180923 + build-fix: remove a _tracef call which was used for debugging (report by Chris Clayton). diff --git a/VERSION b/VERSION index 8e55dcad..997662a0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.1 20180923 +5:0:10 6.1 20180929 diff --git a/dist.mk b/dist.mk index 8bddbc01..2be961ac 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.1243 2018/09/23 08:34:28 tom Exp $ +# $Id: dist.mk,v 1.1244 2018/09/29 14:49:45 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 = 20180923 +NCURSES_PATCH = 20180929 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/misc/terminfo.src b/misc/terminfo.src index ab4e1692..cd380564 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src @@ -6,8 +6,8 @@ # Report bugs and new terminal descriptions to # bug-ncurses@gnu.org # -# $Revision: 1.705 $ -# $Date: 2018/07/21 19:02:07 $ +# $Revision: 1.712 $ +# $Date: 2018/09/30 00:24:04 $ # # 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 @@ -10308,10 +10308,12 @@ tvi925-hi|TeleVideo Model 925 with half intensity standout mode, # I also inserted and ; the :ko: string indicated that # should be present and all tvi native modes use the same string for this. # Finally, note that BSD has cud1=^V. -- esr) +# +# TVI 950 has 11 function-keys -TD tvi950|televideo 950, OTbs, am, hs, mir, msgr, xenl, xon, cols#80, it#8, lines#24, xmc#1, - acsc=b\011c\014d\re\ni\013, bel=^G, cbt=\EI, clear=\E*, + acsc=jHkGlFmEnIqKtMuLvOwNxJ, bel=^G, cbt=\EI, clear=\E*, cr=\r, cub1=^H, cud1=\n, cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW, dl1=\ER, dsl=\Eg\Ef\r, ed=\Ey, el=\Et, flash=\Eb$<200/>\Ed, @@ -10321,12 +10323,14 @@ tvi950|televideo 950, \E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0 \Ef\r, kbs=^H, kcbt=\EI, kclr=\E*, kcub1=^H, kcud1=^V, kcuf1=^L, - kcuu1=^K, kdch1=\EW, kdl1=\ER, ked=\Ey, kel=\Et, kf0=^A0\r, - kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, - kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^, - kich1=\EQ, kil1=\EE, mc4=\Ea, mc5=\E`, ri=\Ej, rmacs=^X, - rmir=\Er, smacs=^U, smir=\Eq, tbc=\E3, tsl=\Eg\Ef, - use=adm+sgr, + kcuu1=^K, kdch1=\EW, kdl1=\ER, ked=\Ey, kel=\Et, kf1=^A@\r, + kf10=^AI\r, kf11=^AJ\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, + kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, + khome=^^, kich1=\EQ, kil1=\EE, mc4=\Ea, mc5=\E`, ri=\Ej, + rmacs=\E%%, rmir=\Er, smacs=\E$, smir=\Eq, tbc=\E3, + tsl=\Eg\Ef, kF1=^A`\r, kF10=^Ai\r, kF11=^Aj\r, kF2=^Aa\r, + kF3=^Ab\r, kF4=^Ac\r, kF5=^Ad\r, kF6=^Ae\r, kF7=^Af\r, + kF8=^Ag\r, kF9=^Ah\r, use=adm+sgr, # # is for 950 with two pages adds the following: # set 48 line page (\E\\2) @@ -10409,7 +10413,7 @@ tvi955|televideo 955, civis=\E.0, cnorm=\E.2, cud1=^V, cup=\E[%i%p1%d;%p2%dH, cvvis=\E.1, dim=\E[=5h, ind@, invis=\EG1, is2=\E[=3l\EF1\Ed\EG0\E[=5l\E%\El, kctab=\E2, khts=\E1, - knp=\EK, kpp=\EJ, krmir=\EQ, ktbc=\E3, mc0=\EP, rmacs=\E%%, + knp=\EK, kpp=\EJ, krmir=\EQ, ktbc=\E3, mc0=\EP, rmacs=\E%, rmam=\E[=7l, rmxon=^N, rs1=\EDF\EC\Eg\Er\EO\E'\E(\Ew\EX\Ee\s\017\E0P\E6\0\E0p\E4\0 \Ef\r, @@ -14049,16 +14053,20 @@ regent25|Adds Regent 25, use=regent20, regent40|Adds Regent 40, xmc#1, - bel=^G, dl1=\El$<2*>, il1=\EM$<2*>, kf0=^B1\r, kf1=^B2\r, - kf2=^B3\r, kf3=^B4\r, kf4=^B5\r, kf5=^B6\r, kf6=^B7\r, - kf7=^B8\r, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, + bel=^G, dl1=\El$<2*>, il1=\EM$<2*>, kf1=^B1\r, kf2=^B2\r, + kf3=^B3\r, kf4=^B4\r, kf5=^B5\r, kf6=^B6\r, kf7=^B7\r, + kf8=^B8\r, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F7, lf7=F8, rmso=\E0@, rmul=\E0@, sgr0=\E0@, smso=\E0P, smul=\E0`, use=regent25, regent40+|Adds Regent 40+, is2=\EB, use=regent40, -regent60|regent200|Adds Regent 60, - dch1=\EE, is2=\EV\EB, kdch1=\EE, kich1=\EF, krmir=\EF, - rmir=\EF, rmso=\ER\E0@\EV, smir=\EF, smso=\ER\E0P\EV, +# It uses a different code for mapping acs vs dim/blink. +regent60|regent200|adds200|Adds Regent 60, + acsc=jLkDl@mHnhq`tXuTv\\wPxd, dch1=\EE, is2=\EV\EB, + kbs=^H, kcbt=\EO, kdch1=\EE, kich1=\EF, krmir=\EF, rmacs=\E2, + rmir=\EF, rmso=\ER\E0@\EV, smacs=\E1, smir=\EF, + smso=\ER\E0P\EV, cd=\Ek, kF1=^B!\r, kF2=^B"\r, kF3=^B#\r, + kF4=^B$\r, kF5=^B%\r, kF6=^B&\r, kF7=^B'\r, kF8=^B(\r, use=regent40+, # From: Thu Jul 9 09:27:33 1981 # (viewpoint: added , function key, and capabilities -- esr) @@ -18340,7 +18348,7 @@ ncrvt100wan|NCRVT100WPP|ncrvt100wpp|NCR VT100 emulation of the 2900 terminal, # P4 <==> Blink attribute parameter # P5 <==> Dim attribute parameter # From , init string hacked by SCO. -ncr7900i|ncr7900|ncr 7900 model 1, +ncr7900i|ncr7900|n7900|ncr 7900 model 1, am, bw, ul, cols#80, lines#24, xmc#1, bel=^G, blink=\E0B, clear=^L, cr=\r, cub1=^H, cud1=\n, cuf1=^F, @@ -25759,4 +25767,18 @@ v3220|LANPAR Vision II model 3220/3221/3222, # + add wy50 and wy60 shifted function-keys as kF1 to kF16 -TD # + remove ansi+rep mis-added to interix in 2018-02-23 -TD # +# 2018-07-28 +# + fix typo in tvi955 -TD +# + corrected acsc for regent60 -TD +# + add alias n7900 -TD +# +# 2018-09-29 +# + corrected acsc for tvi950 -TD +# + remove bogus kf0 from tvi950 -TD +# + added function-key definitions to agree with Televideo 950 manual -TD +# + add bel to tvi950 -TD +# + add shifted function-keys to regent60 -TD +# + renumber regent40 function-keys to match manual -TD +# + add cd (clr_eos) to adds200 -TD +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index ab3b4004..74f3f7d8 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.1+20180923) unstable; urgency=low +ncurses6 (6.1+20180929) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 23 Sep 2018 04:34:28 -0400 + -- Thomas E. Dickey Sat, 29 Sep 2018 10:49:45 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index ab3b4004..74f3f7d8 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.1+20180923) unstable; urgency=low +ncurses6 (6.1+20180929) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 23 Sep 2018 04:34:28 -0400 + -- Thomas E. Dickey Sat, 29 Sep 2018 10:49:45 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 9ef306bb..a4fc3273 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.1+20180923) unstable; urgency=low +ncurses6 (6.1+20180929) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 23 Sep 2018 04:34:27 -0400 + -- Thomas E. Dickey Sat, 29 Sep 2018 10:49:45 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 4f464f65..54904400 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.290 2018/09/23 08:34:28 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.291 2018/09/29 14:49:45 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 "2018" -!define VERSION_MMDD "0923" +!define VERSION_MMDD "0929" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 8458844d..1f45c674 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: 20180923 +Release: 20180929 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 10a0f77c..1ba96eb4 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: 20180923 +Release: 20180929 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index ef5a5aba..05000946 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: 20180923 +Release: 20180929 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz