Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ncurses for openSUSE:Factory checked
in at 2021-01-25 18:22:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ncurses (Old)
and /work/SRC/openSUSE:Factory/.ncurses.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses"
Mon Jan 25 18:22:10 2021 rev:183 rq:865250 version:6.2.MACRO
Changes:
--------
--- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2021-01-20
18:22:49.875280181 +0100
+++ /work/SRC/openSUSE:Factory/.ncurses.new.28504/ncurses.changes
2021-01-25 18:22:11.868306994 +0100
@@ -1,0 +2,14 @@
+Wed Jan 20 20:43:02 UTC 2021 - Andreas Schwab <sch...@suse.de>
+
+- Don't skip test for qemu builds
+
+-------------------------------------------------------------------
+Mon Jan 18 12:59:38 UTC 2021 - Dr. Werner Fink <wer...@suse.de>
+
+- Add ncurses patch 20210116
+ + add comment for linux2.6 regarding CONFIG_CONSOLE_TRANSLATIONS
+ (report by Patrick McDermott) -TD
+ + make opts extension for getcchar work as documented for ncurses 6.1,
+ adding "-g" flag to test/demo_new_pair to illustrate.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ncurses.spec ++++++
--- /var/tmp/diff_new_pack.lcuYXK/_old 2021-01-25 18:22:13.760309693 +0100
+++ /var/tmp/diff_new_pack.lcuYXK/_new 2021-01-25 18:22:13.764309698 +0100
@@ -641,8 +641,8 @@
#
# Some tests
#
-%if 0%{?qemu_user_space_build:1}%{?_crossbuild}
- echo "Skipping tests due to running under QEMU / cross-building"
+%if 0%{?_crossbuild}
+ echo "Skipping tests due to cross-building"
%else
#
# Check for tack program on base of above ncurses
@@ -786,8 +786,8 @@
#
# Some tests
#
-%if 0%{?qemu_user_space_build:1}%{?_crossbuild} || 0%{?suse_version} <= 1500
- echo "Skipping tests due to running under QEMU / cross-building"
+%if 0%{?_crossbuild} || 0%{?suse_version} <= 1500
+ echo "Skipping tests due to cross-building"
%else
#
# Make the test suite for ncurses6
@@ -1088,7 +1088,7 @@
#
cp -p pc/*.pc %{buildroot}%{_libdir}/pkgconfig/
-%if 0%{?qemu_user_space_build:1}%{?_crossbuild}
+%if 0%{?_crossbuild}
# No test here
%else
%check
++++++ ncurses-5.9-ibm327x.dif ++++++
--- /var/tmp/diff_new_pack.lcuYXK/_old 2021-01-25 18:22:13.864309842 +0100
+++ /var/tmp/diff_new_pack.lcuYXK/_new 2021-01-25 18:22:13.868309847 +0100
@@ -4,7 +4,7 @@
--- misc/terminfo.src
+++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000
-@@ -17260,8 +17260,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
+@@ -17278,8 +17278,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-20210116.patch
new/patches/ncurses-6.2-20210116.patch
--- old/patches/ncurses-6.2-20210116.patch 1970-01-01 01:00:00.000000000
+0100
+++ new/patches/ncurses-6.2-20210116.patch 2021-01-18 13:56:24.833561485
+0100
@@ -0,0 +1,380 @@
+# ncurses 6.2 - patch 20210116 - 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-20210116.patch.gz
+# patch by Thomas E. Dickey <dic...@invisible-island.net>
+# created Sun Jan 17 01:35:02 UTC 2021
+#
------------------------------------------------------------------------------
+# NEWS | 8 +++++-
+# VERSION | 2 -
+# dist.mk | 4 +--
+# misc/terminfo.src | 26 +++++++++++++++++++-
+# ncurses/widechar/lib_cchar.c | 15 ++++++++----
+# 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 -
+# test/demo_new_pair.c | 46 +++++++++++++++++++++++++++++++++----
+# 13 files changed, 98 insertions(+), 25 deletions(-)
+#
------------------------------------------------------------------------------
+Index: NEWS
+Prereq: 1.3616
+--- ncurses-6.2-20210109+/NEWS 2021-01-09 11:03:34.000000000 +0000
++++ ncurses-6.2-20210116/NEWS 2021-01-17 00:50:16.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written
--
+ -- authorization.
--
+
-------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3616 2021/01/09 11:03:34 tom Exp $
++-- $Id: NEWS,v 1.3619 2021/01/17 00:50:16 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.
+
++20210116
++ + add comment for linux2.6 regarding CONFIG_CONSOLE_TRANSLATIONS
++ (report by Patrick McDermott) -TD
++ + make opts extension for getcchar work as documented for ncurses 6.1,
++ adding "-g" flag to test/demo_new_pair to illustrate.
++
+ 20210109
+ + fix errata in man/ncurses.3x from recent updates.
+ + improve quoting/escaping in configure script, uses some features of
+Index: VERSION
+--- ncurses-6.2-20210109+/VERSION 2021-01-09 09:49:29.000000000 +0000
++++ ncurses-6.2-20210116/VERSION 2021-01-16 10:31:57.000000000 +0000
+@@ -1 +1 @@
+-5:0:10 6.2 20210109
++5:0:10 6.2 20210116
+Index: dist.mk
+Prereq: 1.1395
+--- ncurses-6.2-20210109+/dist.mk 2021-01-09 09:49:29.000000000 +0000
++++ ncurses-6.2-20210116/dist.mk 2021-01-16 10:31:57.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written #
+ # authorization. #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1395 2021/01/09 09:49:29 tom Exp $
++# $Id: dist.mk,v 1.1396 2021/01/16 10:31:57 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 = 20210109
++NCURSES_PATCH = 20210116
+
+ # 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-20210109+/misc/terminfo.src 2020-12-28 00:40:10.000000000
+0000
++++ ncurses-6.2-20210116/misc/terminfo.src 2021-01-17 00:39:21.000000000
+0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ # bug-ncur...@gnu.org
+ #
+-# $Revision: 1.840 $
+-# $Date: 2020/12/28 00:40:10 $
++# $Revision: 1.841 $
++# $Date: 2021/01/17 00:39: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
+@@ -1028,6 +1028,24 @@
+ # 'p' scan line 3
+ # 'r' scan line 7
+ # '_' scan line 9
++#
++# The fix for SI/SO is part of a configurable (i.e., "optional") kernel
feature
++# misleadingly called CONFIG_CONSOLE_TRANSLATIONS. Disabling that not only
++# omits the line-drawing using SI/SO, but also part/all of the Unicode
feature:
++#
++# https://cateee.net/lkddb/web-lkddb/CONSOLE_TRANSLATIONS.html
++# "This enables support for font mapping and Unicode translation on
virtual consoles."
++#
++# This mailing list thread in July 2008 illustrates:
++#
++# https://marc.info/?t=121734656700005&r=1&w=4
++# "commit a29ccf6f823a84d89e1c7aaaf221cf7282022024 break console on
slackware 12.1"
++#
++# The change which made it configurable was to reduce the size for use in
++# embedded systems. Some background is found in
++#
++# https://lwn.net/Articles/284767/
++# "An interview with the new embedded maintainers"
+ linux2.6|linux 2.6.x console,
+ acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
+ yzz{{||}}~~,
+@@ -26778,4 +26796,8 @@
+ # 2020-12-27
+ # + update terminology to 1.8.1 -TD
+ #
++# 2021-01-16
++# + add comment for linux2.6 regarding CONFIG_CONSOLE_TRANSLATIONS
++# (report by Patrick McDermott) -TD
++#
+ ######## SHANTIH! SHANTIH! SHANTIH!
+Index: ncurses/widechar/lib_cchar.c
+Prereq: 1.34
+--- ncurses-6.2-20210109+/ncurses/widechar/lib_cchar.c 2020-07-11
22:55:08.000000000 +0000
++++ ncurses-6.2-20210116/ncurses/widechar/lib_cchar.c 2021-01-17
00:04:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey *
++ * Copyright 2019-2020,2021 Thomas E. Dickey *
+ * Copyright 2001-2016,2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -37,7 +37,7 @@
+ #include <curses.priv.h>
+ #include <wchar.h>
+
+-MODULE_ID("$Id: lib_cchar.c,v 1.34 2020/07/11 22:55:08 tom Exp $")
++MODULE_ID("$Id: lib_cchar.c,v 1.35 2021/01/17 00:04:08 tom Exp $")
+
+ /*
+ * The SuSv2 description leaves some room for interpretation. We'll assume
wch
+@@ -56,7 +56,7 @@
+ int color_pair = pair_arg;
+ unsigned len;
+
+- TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"),
++ TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,attrs=%lu,pair=%d,%p)"),
+ (void *) wcval, _nc_viswbuf(wch),
+ (unsigned long) attrs, color_pair, opts));
+
+@@ -114,7 +114,12 @@
+ (void *) pair_arg,
+ opts));
+
+- if (opts == NULL && wcval != NULL) {
++#if !NCURSES_EXT_COLORS
++ if (opts != NULL) {
++ ; /* empty */
++ } else
++#endif
++ if (wcval != NULL) {
+ wchar_t *wp;
+ int len;
+
+@@ -131,6 +136,8 @@
+ } else if (attrs == 0 || pair_arg == 0) {
+ code = ERR;
+ } else if (len >= 0) {
++ TR(TRACE_CCALLS, ("copy %d wchars, first is %s", len,
++ _tracecchar_t(wcval)));
+ *attrs = AttrOf(*wcval) & A_ATTRIBUTES;
+ color_pair = GetPair(*wcval);
+ get_extended_pair(opts, color_pair);
+Index: package/debian-mingw/changelog
+--- ncurses-6.2-20210109+/package/debian-mingw/changelog 2021-01-09
09:49:29.000000000 +0000
++++ ncurses-6.2-20210116/package/debian-mingw/changelog 2021-01-16
10:31:57.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20210109) unstable; urgency=low
++ncurses6 (6.2+20210116) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dic...@invisible-island.net> Mon, 04 Jan 2021 03:45:02
-0500
++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 16 Jan 2021 05:31:57
-0500
+
+ ncurses6 (5.9-20131005) unstable; urgency=low
+
+Index: package/debian-mingw64/changelog
+--- ncurses-6.2-20210109+/package/debian-mingw64/changelog 2021-01-09
09:49:29.000000000 +0000
++++ ncurses-6.2-20210116/package/debian-mingw64/changelog 2021-01-16
10:31:57.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20210109) unstable; urgency=low
++ncurses6 (6.2+20210116) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dic...@invisible-island.net> Mon, 04 Jan 2021 03:45:02
-0500
++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 16 Jan 2021 05:31:57
-0500
+
+ ncurses6 (5.9-20131005) unstable; urgency=low
+
+Index: package/debian/changelog
+--- ncurses-6.2-20210109+/package/debian/changelog 2021-01-09
09:49:29.000000000 +0000
++++ ncurses-6.2-20210116/package/debian/changelog 2021-01-16
10:31:57.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20210109) unstable; urgency=low
++ncurses6 (6.2+20210116) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dic...@invisible-island.net> Mon, 04 Jan 2021 03:45:02
-0500
++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 16 Jan 2021 05:31:57
-0500
+
+ ncurses6 (5.9-20120608) unstable; urgency=low
+
+Index: package/mingw-ncurses.nsi
+Prereq: 1.438
+--- ncurses-6.2-20210109+/package/mingw-ncurses.nsi 2021-01-09
09:49:29.000000000 +0000
++++ ncurses-6.2-20210116/package/mingw-ncurses.nsi 2021-01-16
10:31:57.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.438 2021/01/09 09:49:29 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.439 2021/01/16 10:31:57 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 "2021"
+-!define VERSION_MMDD "0109"
++!define VERSION_MMDD "0116"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+
+ !define MY_ABI "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.2-20210109+/package/mingw-ncurses.spec 2021-01-09
09:49:29.000000000 +0000
++++ ncurses-6.2-20210116/package/mingw-ncurses.spec 2021-01-16
10:31:57.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.2
+-Release: 20210109
++Release: 20210116
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.2-20210109+/package/ncurses.spec 2021-01-09 09:49:29.000000000
+0000
++++ ncurses-6.2-20210116/package/ncurses.spec 2021-01-16 10:31:57.000000000
+0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.2
+-Release: 20210109
++Release: 20210116
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.2-20210109+/package/ncursest.spec 2021-01-09
09:49:29.000000000 +0000
++++ ncurses-6.2-20210116/package/ncursest.spec 2021-01-16 10:31:57.000000000
+0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.2
+-Release: 20210109
++Release: 20210116
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/demo_new_pair.c
+Prereq: 1.21
+--- ncurses-6.2-20210109+/test/demo_new_pair.c 2020-02-02 23:34:34.000000000
+0000
++++ ncurses-6.2-20210116/test/demo_new_pair.c 2021-01-17 00:11:09.000000000
+0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2019,2020 Thomas E. Dickey *
++ * Copyright 2018-2020,2021 Thomas E. Dickey *
+ * Copyright 2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: demo_new_pair.c,v 1.21 2020/02/02 23:34:34 tom Exp $
++ * $Id: demo_new_pair.c,v 1.23 2021/01/17 00:11:09 tom Exp $
+ *
+ * Demonstrate the alloc_pair() function.
+ */
+@@ -136,6 +136,7 @@
+ "Repeatedly print using all possible color combinations.",
+ "",
+ "Options:",
++ " -g use getcchar to check setcchar",
+ " -i use init_pair rather than alloc_pair",
+ " -p start in paged-mode",
+ " -s start in single-step mode",
+@@ -186,6 +187,7 @@
+ };
+
+ bool done = FALSE;
++ bool check_set = FALSE;
+ bool clobber = FALSE;
+ bool hascolor = FALSE;
+ bool use_init = FALSE;
+@@ -202,8 +204,11 @@
+
+ setlocale(LC_ALL, "");
+
+- while ((ch = getopt(argc, argv, "ipsw")) != -1) {
++ while ((ch = getopt(argc, argv, "gipsw")) != -1) {
+ switch (ch) {
++ case 'g':
++ check_set = TRUE;
++ break;
+ case 'i':
+ use_init = TRUE;
+ break;
+@@ -317,7 +322,7 @@
+ : make_color(current));
+ }
+ } else {
+- my_attrs = next_attr(current);
++ my_attrs = next_attr(current);
+ my_pair = 0;
+ }
+ if (my_pair < 0)
+@@ -327,6 +332,39 @@
+ setcchar(&temp, wch, my_attrs,
+ (short) my_pair,
+ (use_init ? NULL : (void *) &my_pair));
++
++ if (check_set) {
++ int problem = 0;
++ wchar_t chk_wch[2];
++ attr_t chk_attrs = 0;
++ short chk_pair = 0;
++ int chk_pair2 = 0;
++
++#define AllButColor(a) ((a) & (A_ATTRIBUTES & ~A_COLOR))
++
++ if (getcchar(&temp, NULL, &chk_attrs, &chk_pair,
++ (use_init ? NULL : (void *) &chk_pair2)) != 2) {
++ problem = 1;
++ } else if (getcchar(&temp, chk_wch, &chk_attrs, &chk_pair,
++ (use_init ? NULL : (void *) &chk_pair2)) != OK) {
++ problem = 2;
++ } else if (chk_wch[0] != wch[0]) {
++ problem = 3;
++ } else if (AllButColor(my_attrs) != AllButColor(chk_attrs)) {
++ problem = 4;
++ } else if (my_pair != chk_pair) {
++ problem = 4;
++ } else if (!use_init && (my_pair != chk_pair2)) {
++ problem = 5;
++ }
++ if (problem) {
++ wch[0] = problem + '0';
++ setcchar(&temp, wch, my_attrs,
++ (short) my_pair,
++ (use_init ? NULL : (void *) &my_pair));
++ }
++ }
++
+ /*
+ * At the end of a page, move the cursor to the home position.
+ */
++++++ ncurses-6.2.dif ++++++
--- /var/tmp/diff_new_pack.lcuYXK/_old 2021-01-25 18:22:15.752312535 +0100
+++ /var/tmp/diff_new_pack.lcuYXK/_new 2021-01-25 18:22:15.752312535 +0100
@@ -420,7 +420,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
-@@ -1032,6 +1040,7 @@ linux2.6|linux 2.6.x console,
+@@ -1050,6 +1058,7 @@ linux2.6|linux 2.6.x console,
acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
yzz{{||}}~~,
enacs=\E)0, rmacs=^O,
@@ -428,7 +428,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,
-@@ -2512,6 +2521,7 @@ vt132|DEC vt132,
+@@ -2530,6 +2539,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.
@@ -436,7 +436,7 @@
#
# added msgr -TD
vt220-old|vt200-old|DEC VT220 in vt100 emulation mode,
-@@ -2522,7 +2532,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e
+@@ -2540,7 +2550,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,
@@ -445,7 +445,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,
-@@ -2683,6 +2693,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul.
+@@ -2701,6 +2711,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)
@@ -453,7 +453,7 @@
vt320|vt300|dec vt320 7 bit terminal,
am, hs, mir, msgr, xenl,
cols#80, lines#24, wsl#80,
-@@ -2692,7 +2703,7 @@ vt320|vt300|dec vt320 7 bit terminal,
+@@ -2710,7 +2721,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,
@@ -462,7 +462,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,
-@@ -4134,6 +4145,7 @@ mintty+common|shared capabilities for mi
+@@ -4152,6 +4163,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.
@@ -470,7 +470,7 @@
teraterm2.3|Tera Term Pro,
km,
ncv#43, vt@,
-@@ -4142,7 +4154,7 @@ teraterm2.3|Tera Term Pro,
+@@ -4160,7 +4172,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,
@@ -479,7 +479,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~,
-@@ -4475,6 +4487,7 @@ xterm-mono|monochrome xterm,
+@@ -4493,6 +4505,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.
@@ -487,7 +487,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@,
-@@ -4484,7 +4497,7 @@ xterm-xf86-v32|xterm terminal emulator (
+@@ -4502,7 +4515,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,
@@ -496,7 +496,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,
-@@ -5180,8 +5193,26 @@ xterm-noapp|xterm with cursor keys in no
+@@ -5198,8 +5211,26 @@ xterm-noapp|xterm with cursor keys in no
xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
lines#24, use=xterm-old,
@@ -523,7 +523,7 @@
use=xterm-new,
# This entry assumes that xterm's handling of VT100 SI/SO is disabled by
-@@ -5526,7 +5557,7 @@ xterms-sun|small (80x24) xterm with sunF
+@@ -5544,7 +5575,7 @@ xterms-sun|small (80x24) xterm with sunF
#### GNOME (VTE)
# this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
@@ -532,7 +532,7 @@
bce,
kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
use=xterm-color,
-@@ -5777,10 +5808,14 @@ mgt|Multi GNOME Terminal,
+@@ -5795,10 +5826,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).
@@ -548,7 +548,7 @@
# Konsole 1.0.1 (2001/11/25)
# (formerly known as kvt)
#
-@@ -6032,14 +6067,14 @@ mlterm3|multi lingual terminal emulator,
+@@ -6050,14 +6085,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,
@@ -566,7 +566,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=^?,
-@@ -6096,6 +6131,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
+@@ -6114,6 +6149,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".
@@ -574,7 +574,7 @@
#
# removed dch/dch1 because they are inconsistent with bce/ech -TD
# remove km as per tack test -TD
-@@ -6107,13 +6143,14 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -6125,13 +6161,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,
@@ -592,7 +592,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,
-@@ -6124,7 +6161,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -6142,7 +6179,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,
@@ -601,7 +601,7 @@
# Key Codes from rxvt reference:
#
# Note: Shift + F1-F10 generates F11-F20
-@@ -6207,8 +6244,8 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -6225,8 +6262,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,
@@ -612,7 +612,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~,
-@@ -6299,6 +6336,38 @@ rxvt-cygwin-native|rxvt terminal emulato
+@@ -6317,6 +6354,38 @@ rxvt-cygwin-native|rxvt terminal emulato
\302x\263y\363z\362{\343|\330~\376,
use=rxvt-cygwin,
@@ -651,7 +651,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,
-@@ -6345,7 +6414,7 @@ mrxvt-256color|multitabbed rxvt with 256
+@@ -6363,7 +6432,7 @@ mrxvt-256color|multitabbed rxvt with 256
# Eterm 0.9.3
#
# removed kf0 which conflicts with kf10 -TD
@@ -660,7 +660,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
-@@ -6359,12 +6428,12 @@ Eterm|Eterm-color|Eterm with xterm-style
+@@ -6377,12 +6446,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,
@@ -675,7 +675,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=,
-@@ -7360,7 +7429,7 @@ pty|4bsd pseudo teletype,
+@@ -7378,7 +7447,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
@@ -684,7 +684,7 @@
am, mir, xenl,
cols#80, lines#24,
bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-@@ -7373,6 +7442,13 @@ eterm|gnu emacs term.el terminal emulati
+@@ -7391,6 +7460,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,
@@ -698,7 +698,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,
-@@ -7501,7 +7577,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -7519,7 +7595,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,
@@ -707,7 +707,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,
-@@ -7623,6 +7699,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
+@@ -7641,6 +7717,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
use=xterm+x11mouse, use=xterm-new,
#:screen.xterm|screen for modern xterm,
#: use=screen.xterm-new,
@@ -721,7 +721,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,
-@@ -7710,7 +7793,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
+@@ -7728,7 +7811,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,
@@ -730,7 +730,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,
-@@ -9618,7 +9701,7 @@ hp700-wy|HP700/41 emulating wyse30,
+@@ -9636,7 +9719,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,
@@ -739,7 +739,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,
-@@ -12849,6 +12932,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
+@@ -12867,6 +12950,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)
@@ -747,7 +747,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,
-@@ -12858,7 +12942,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
+@@ -12876,7 +12960,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,
@@ -756,7 +756,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,
-@@ -17270,7 +17354,7 @@ ibm3101|i3101|IBM 3101-10,
+@@ -17288,7 +17372,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,
@@ -765,7 +765,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
-@@ -17528,7 +17612,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
+@@ -17546,7 +17630,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.
