Hello community,
here is the log from the commit of package ncurses for openSUSE:Factory checked
in at 2015-05-06 11:21:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ncurses (Old)
and /work/SRC/openSUSE:Factory/.ncurses.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2015-04-23
07:55:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ncurses.new/ncurses.changes 2015-05-06
11:21:52.000000000 +0200
@@ -1,0 +2,21 @@
+Mon Apr 27 09:18:50 UTC 2015 - wer...@suse.de
+
+- Add ncurses patch 20150425
+ + expanded description of tgetstr's area pointer in manual page
+ (report by Todd M Lewis).
+ + in-progress changes to modify test-packages to use ncursesw6 rather
+ than ncursesw, with updated configure scripts.
+ + modify CF_NCURSES_CONFIG in Ada95- and test-configure scripts to
+ check for ".pc" files via pkg-config, but add a linkage check since
+ frequently pkg-config configurations are broken.
+ + modify misc/gen-pkgconfig.in to include EXTRA_LDFLAGS, e.g., for the
+ rpath option.
+ + add 'dim' capability to screen entry (report by Leonardo B Schenkel)
+ + add several key definitions to nsterm-bce to match preconfigured
+ keys, e.g., with OSX 10.9 and 10.10 (report by Leonardo B Schenkel)
+ + fix repeated "extra-suffix" in ncurses-config.in (cf: 20150418).
+ + improve term_variables manual page, adding section on the terminfo
+ long-name symbols which are defined in the term.h header.
+ + fix bug in lib_tracebits.c introduced in const-fixes (cf: 20150404).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ncurses.spec ++++++
--- /var/tmp/diff_new_pack.1Bvupv/_old 2015-05-06 11:21:53.000000000 +0200
+++ /var/tmp/diff_new_pack.1Bvupv/_new 2015-05-06 11:21:53.000000000 +0200
@@ -380,7 +380,8 @@
#
# No --enable-term-driver as this had crashed last time
# in ncurses/tinfo/lib_setup.c due to the fact that
- # _nc_globals.term_driver was a NULL function pointer
+ # _nc_globals.term_driver was a NULL function pointer as
+ # this is for the MinGW port!
#
# No --enable-tcap-names because we may have to recompile
# programs or foreign programs won't work
@@ -434,6 +435,7 @@
--enable-sigwinch \
--enable-colorfgbg \
--enable-sp-funcs \
+ --enable-interop \
%if %abi >= 6
--with-pthread \
--enable-reentrant \
@@ -564,6 +566,7 @@
--enable-ext-mouse \
--disable-widec \
--disable-ext-colors \
+ --disable-overwrite \
%if %{with symversion}
--with-versioned-syms=${PWD}/package/ncursest.map \
%endif
@@ -604,6 +607,7 @@
--enable-ext-mouse \
--enable-widec \
--enable-ext-colors \
+ --disable-overwrite \
%if %{with symversion}
--with-versioned-syms=${PWD}/package/ncursestw.map \
%endif
@@ -650,6 +654,7 @@
--enable-ext-mouse \
--enable-widec \
--enable-ext-colors \
+ --disable-overwrite \
%if %{with symversion}
--with-versioned-syms=${PWD}/package/ncursestw.map \
%endif
++++++ ncurses-5.9-overwrite.dif ++++++
--- /var/tmp/diff_new_pack.1Bvupv/_old 2015-05-06 11:21:53.000000000 +0200
+++ /var/tmp/diff_new_pack.1Bvupv/_new 2015-05-06 11:21:53.000000000 +0200
@@ -15,11 +15,11 @@
AC_ARG_ENABLE(database,
--- configure
+++ configure 2013-09-30 09:17:52.000000000 +0000
-@@ -6799,6 +6799,7 @@ else
+@@ -6956,6 +6956,7 @@ else
fi;
- echo "$as_me:6900: result: $with_overwrite" >&5
+ echo "$as_me:6957: result: $with_overwrite" >&5
echo "${ECHO_T}$with_overwrite" >&6
+WITH_OVERWRITE="$with_overwrite"
- echo "$as_me:6903: checking if external terminfo-database is used" >&5
+ echo "$as_me:6960: checking if external terminfo-database is used" >&5
echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
++++++ ncurses-5.9-patches.tar.bz2 ++++++
++++ 93031 lines of diff (skipped)
++++++ ncurses-5.9.dif ++++++
--- /var/tmp/diff_new_pack.1Bvupv/_old 2015-05-06 11:21:58.000000000 +0200
+++ /var/tmp/diff_new_pack.1Bvupv/_new 2015-05-06 11:21:58.000000000 +0200
@@ -7,7 +7,7 @@
include/tic.h | 4 -
man/man_db.renames | 2
man/ncurses.3x | 4 +
- misc/gen-pkgconfig.in | 9 ++
+ misc/gen-pkgconfig.in | 7 +-
misc/ncurses-config.in | 2
misc/terminfo.src | 131
++++++++++++++++++++++++++++++++++---------
ncurses/Makefile.in | 2
@@ -19,11 +19,11 @@
ncurses/tinfo/read_entry.c | 2
ncurses/tinfo/read_termcap.c | 21 ++++--
test/test.priv.h | 4 -
- 20 files changed, 241 insertions(+), 80 deletions(-)
+ 20 files changed, 240 insertions(+), 79 deletions(-)
--- aclocal.m4
-+++ aclocal.m4 2010-10-11 13:57:42.000000000 +0000
-@@ -523,7 +523,7 @@ AC_MSG_CHECKING([for size of bool])
++++ aclocal.m4 2015-04-27 10:47:04.000000000 +0000
+@@ -554,7 +554,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out
AC_TRY_RUN([
@@ -32,7 +32,7 @@
#include <stdio.h>
#if defined(__cplusplus)
-@@ -4462,12 +4462,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4507,12 +4507,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source
cf_target="\$cf_source"
fi
@@ -50,7 +50,7 @@
sed -f $cf_man_alias \\
CF_EOF
-@@ -4477,7 +4480,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4522,7 +4525,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@@ -59,7 +59,7 @@
CF_EOF
fi
-@@ -4517,7 +4520,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4562,7 +4565,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@@ -68,7 +68,7 @@
CF_EOF
fi
-@@ -4526,23 +4529,23 @@ case "$MANPAGE_FORMAT" in #(vi
+@@ -4571,23 +4574,23 @@ case "$MANPAGE_FORMAT" in
cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories
@@ -98,7 +98,7 @@
for cf_alias in \$aliases
do
if test \$section = 1 ; then
-@@ -4551,7 +4554,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4596,7 +4599,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix}
; then
@@ -107,15 +107,15 @@
then
continue
fi
-@@ -4561,18 +4564,18 @@ CF_EOF
- case "x$LN_S" in #(vi
- *-f) #(vi
+@@ -4606,18 +4609,18 @@ CF_EOF
+ case "x$LN_S" in
+ (*-f)
cat >>$cf_edit_man <<CF_EOF
- $LN_S \$cf_target
\$cf_alias\${suffix}
+ $LN_S \$t \$cf_alias\${suffix}
CF_EOF
;;
- *)
+ (*)
cat >>$cf_edit_man <<CF_EOF
rm -f \$cf_alias\${suffix}
- $LN_S \$cf_target
\$cf_alias\${suffix}
@@ -129,7 +129,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
-@@ -4592,9 +4595,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4637,9 +4640,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@@ -142,7 +142,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
-@@ -4614,6 +4617,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4659,6 +4662,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@@ -152,7 +152,7 @@
done
--- configure.in
+++ configure.in 2012-01-30 16:31:47.000000000 +0000
-@@ -1881,6 +1881,7 @@ if test "$with_termlib" != no ; then
+@@ -1924,6 +1924,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@@ -161,17 +161,17 @@
# the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME}
--- configure
-+++ configure 2012-01-30 16:42:40.000000000 +0000
-@@ -5797,7 +5797,7 @@ irix*) #(vi
++++ configure 2015-04-27 10:46:08.000000000 +0000
+@@ -5832,7 +5832,7 @@ case $cf_cv_system_name in
fi
;;
- linux*|gnu*|k*bsd*-gnu) #(vi
+ (linux*|gnu*|k*bsd*-gnu)
- LD_RPATH_OPT="-Wl,-rpath,"
+ LD_RPATH_OPT="-Wl,-rpath-link,"
;;
- openbsd[2-9].*|mirbsd*) #(vi
+ (openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath,"
-@@ -11268,12 +11268,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11326,12 +11326,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source
cf_target="\$cf_source"
fi
@@ -189,7 +189,7 @@
sed -f $cf_man_alias \\
CF_EOF
-@@ -11283,7 +11286,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11341,7 +11344,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@@ -198,7 +198,7 @@
CF_EOF
fi
-@@ -11323,7 +11326,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11381,7 +11384,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@@ -207,7 +207,7 @@
CF_EOF
fi
-@@ -11332,23 +11335,23 @@ case "$MANPAGE_FORMAT" in #(vi
+@@ -11390,23 +11393,23 @@ case "$MANPAGE_FORMAT" in
cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories
@@ -237,7 +237,7 @@
for cf_alias in \$aliases
do
if test \$section = 1 ; then
-@@ -11357,7 +11360,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11415,7 +11418,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix}
; then
@@ -246,15 +246,15 @@
then
continue
fi
-@@ -11367,18 +11370,18 @@ CF_EOF
- case "x$LN_S" in #(vi
- *-f) #(vi
+@@ -11425,18 +11428,18 @@ CF_EOF
+ case "x$LN_S" in
+ (*-f)
cat >>$cf_edit_man <<CF_EOF
- $LN_S \$cf_target
\$cf_alias\${suffix}
+ $LN_S \$t \$cf_alias\${suffix}
CF_EOF
;;
- *)
+ (*)
cat >>$cf_edit_man <<CF_EOF
rm -f \$cf_alias\${suffix}
- $LN_S \$cf_target
\$cf_alias\${suffix}
@@ -268,7 +268,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
-@@ -11398,9 +11401,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11456,9 +11459,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@@ -281,7 +281,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
-@@ -11420,6 +11423,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11478,6 +11481,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@@ -289,7 +289,7 @@
;;
esac
done
-@@ -21518,6 +21522,7 @@ if test "$with_termlib" != no ; then
+@@ -21610,6 +21614,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@@ -362,25 +362,25 @@
called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in
-+++ misc/gen-pkgconfig.in 2015-02-27 09:15:36.453859292 +0000
-@@ -75,7 +75,7 @@ if test "$includedir" != "/usr/include"
- CFLAGS="$CFLAGS -I\${includedir}"
++++ misc/gen-pkgconfig.in 2015-05-04 09:00:48.177518503 +0000
+@@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
fi
--if test "$libdir" = "/usr/lib" ; then
-+if test "$libdir" = "/usr/lib" -o "$libdir" = "/usr/lib64" ; then
- LDFLAGS=
- else
- LDFLAGS="-L\${libdir}"
-@@ -86,6 +86,7 @@ do
- name="${name}"
+ LDFLAGS="@LDFLAGS@"
+-if test "$libdir" != "/usr/lib" ; then
++if test "$libdir" != "/usr/lib" -a "$libdir" != "/usr/lib64" ; then
+ LDFLAGS="$LDFLAGS -L\${libdir}"
+ fi
+ if test "x@EXTRA_LDFLAGS@" != "x" ; then
+@@ -109,6 +109,7 @@ do
+ LIBS="-l$name"
desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
+ deps=
reqs=
if test $name = $MAIN_LIBRARY ; then
-@@ -94,9 +95,11 @@ do
+@@ -118,9 +119,11 @@ do
desc="$desc terminal interface library"
elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix},
$FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}"
@@ -392,37 +392,28 @@
desc="$desc add-on library"
fi
-@@ -104,6 +107,8 @@ do
- if test $name != $TINFO_NAME ; then
- test -n "$reqs" && reqs="$reqs, "
- reqs="${reqs}${SUB_LIBRARY}${suffix}"
-+ test -n "$deps" && deps="$deps "
-+ deps="${deps}-l${SUB_LIBRARY}"
- fi
+@@ -130,6 +133,8 @@ do
+ test $NEED_TINFO != yes ; then
+ test -n "$reqs" && reqs="$reqs, "
+ reqs="${reqs}${SUB_LIBRARY}${suffix}"
++ test -n "$deps" && deps="$deps "
++ deps="${deps}-l${SUB_LIBRARY}"
fi
-@@ -121,7 +126,7 @@ Description: $desc
- Version: \${version}
- URL: http://invisible-island.net/ncurses
- Requires.private: $reqs
--Libs: $LDFLAGS -l$name
-+Libs: $LDFLAGS -l$name $deps
- Libs.private: @LIBS@
- Cflags: $CFLAGS
- EOF
+ echo "** creating ${name}${suffix}.pc"
--- misc/ncurses-config.in
-+++ misc/ncurses-config.in 2015-02-27 09:16:29.033518189 +0000
-@@ -98,7 +98,7 @@ while test $# -gt 0; do
++++ misc/ncurses-config.in 2015-04-27 10:43:26.000000000 +0000
+@@ -100,7 +100,7 @@ while test $# -gt 0; do
# compile/link
--cflags)
INCS="@PKG_CFLAGS@"
- if test "x@WITH_OVERWRITE@" = xno ; then
-+ if test "${THIS%[0-5]*}" != ncurses ; then
- INCS="$INCS -I${includedir}/${THIS}"
++ if test "${THIS%[0-5]*}" = xno ; then
+ INCS="$INCS -I${includesubdir}"
fi
if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src
-+++ misc/terminfo.src 2014-03-26 13:44:39.000000000 +0000
++++ misc/terminfo.src 2015-04-27 10:38:20.000000000 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am,
cols#80,
@@ -434,7 +425,7 @@
gn, use=dumb,
lpr|printer|line printer,
OTbs, hc, os,
-@@ -1622,9 +1624,15 @@ linux-c|linux console 1.3.6+ for older n
+@@ -1635,9 +1637,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>.
@@ -451,7 +442,7 @@
# Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here:
# http://lkml.indiana.edu/hypermail/linux/kernel/0602.2/0868.html
-@@ -3007,6 +3015,7 @@ vt132|DEC vt132,
+@@ -3020,6 +3028,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.
@@ -459,7 +450,7 @@
#
# added msgr -TD
vt220-old|vt200-old|DEC VT220 in vt100 emulation mode,
-@@ -3017,7 +3026,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e
+@@ -3030,7 +3039,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=^M,
csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C,
@@ -468,7 +459,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,
-@@ -3174,6 +3183,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul.
+@@ -3187,6 +3196,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)
@@ -476,7 +467,7 @@
vt320|vt300|dec vt320 7 bit terminal,
am, hs, mir, msgr, xenl,
cols#80, lines#24, wsl#80,
-@@ -3183,7 +3193,7 @@ vt320|vt300|dec vt320 7 bit terminal,
+@@ -3196,7 +3206,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=^J, cuf=\E[%p1%dC, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@@ -485,7 +476,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,
-@@ -3606,13 +3616,14 @@ putty-sco|putty with SCO function keys,
+@@ -3619,13 +3629,14 @@ putty-sco|putty with SCO function keys,
# 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.
@@ -501,7 +492,7 @@
dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
flash=\E[?5h\E[?5l$<200/>, hpa=\E[%i%p1%dG,
il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~,
-@@ -3815,6 +3826,7 @@ xterm-old|antique xterm version,
+@@ -3828,6 +3839,7 @@ xterm-old|antique xterm version,
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.
@@ -509,7 +500,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@,
-@@ -3824,7 +3836,7 @@ xterm-xf86-v32|xterm terminal emulator (
+@@ -3837,7 +3849,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=^J, cuf=\E[%p1%dC, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@@ -518,7 +509,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,
-@@ -4292,8 +4304,26 @@ xterm-noapp|xterm with cursor keys in no
+@@ -4305,8 +4317,26 @@ xterm-noapp|xterm with cursor keys in no
xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
lines#24, use=xterm-old,
@@ -545,7 +536,7 @@
use=xterm-new,
# This entry assumes that xterm's handling of VT100 SI/SO is disabled by
-@@ -4628,7 +4658,7 @@ xterms-sun|small (80x24) xterm with sunF
+@@ -4641,7 +4671,7 @@ xterms-sun|small (80x24) xterm with sunF
#### GNOME (VTE)
# this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
@@ -554,7 +545,7 @@
bce,
kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
use=xterm-color,
-@@ -4792,10 +4822,14 @@ mgt|Multi GNOME Terminal,
+@@ -4805,10 +4835,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).
@@ -570,7 +561,7 @@
# Konsole 1.0.1
# (formerly known as kvt)
#
-@@ -4926,14 +4960,14 @@ mlterm3|multi lingual terminal emulator,
+@@ -4939,14 +4973,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,
@@ -588,7 +579,7 @@
home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS,
is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
-@@ -4988,6 +5022,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
+@@ -5001,6 +5035,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".
@@ -596,7 +587,7 @@
#
# removed dch/dch1 because they are inconsistent with bce/ech -TD
# remove km as per tack test -TD
-@@ -4999,13 +5034,14 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -5012,13 +5047,14 @@ rxvt-basic|rxvt terminal base (X Window
clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
@@ -614,7 +605,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,
-@@ -5014,7 +5050,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -5027,7 +5063,7 @@ rxvt-basic|rxvt terminal base (X Window
sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%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,
@@ -623,7 +614,7 @@
# Key Codes from rxvt reference:
#
# Note: Shift + F1-F10 generates F11-F20
-@@ -5097,8 +5133,8 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -5110,8 +5146,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,
@@ -634,7 +625,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~,
-@@ -5155,6 +5191,39 @@ rxvt-cygwin-native|rxvt terminal emulato
+@@ -5168,6 +5204,39 @@ rxvt-cygwin-native|rxvt terminal emulato
acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330~\376,
use=rxvt-cygwin,
@@ -674,7 +665,7 @@
# This variant is supposed to work with rxvt 2.7.7 when compiled with
# NO_BRIGHTCOLOR defined. rxvt needs more work...
rxvt-16color|xterm with 16 colors like aixterm,
-@@ -5201,7 +5270,7 @@ mrxvt-256color|multitabbed rxvt with 256
+@@ -5214,7 +5283,7 @@ mrxvt-256color|multitabbed rxvt with 256
# Eterm 0.9.3
#
# removed kf0 which conflicts with kf10 -TD
@@ -683,7 +674,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
-@@ -5215,13 +5284,13 @@ Eterm|Eterm-color|Eterm with xterm-style
+@@ -5228,13 +5297,13 @@ 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,
@@ -699,7 +690,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=,
-@@ -5790,7 +5859,7 @@ pty|4bsd pseudo teletype,
+@@ -5803,7 +5872,7 @@ pty|4bsd pseudo teletype,
#### Emacs
# The codes supported by the term.el terminal emulation in GNU Emacs 19.30
@@ -708,7 +699,7 @@
am, mir, xenl,
cols#80, lines#24,
bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M,
-@@ -5803,6 +5872,13 @@ eterm|gnu emacs term.el terminal emulati
+@@ -5816,6 +5885,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,
@@ -722,16 +713,16 @@
# 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,
-@@ -5902,7 +5978,7 @@ screen|VT 100/ANSI X3.64 virtual termina
- cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, 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, ht=^I, hts=\EH, ich=\E[%p1%d@,
-- il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=^H, kcbt=\E[Z,
-+ il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=\177, kcbt=\E[Z,
- kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
- kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
+@@ -5916,7 +5992,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, ht=^I, hts=\EH,
+ ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0,
+- kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
++ kbs=\177, kcbt=\E[Z, 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,
-@@ -6083,7 +6159,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
+ kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+@@ -6096,7 +6172,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,
@@ -740,7 +731,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=^M^J, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m,
-@@ -7817,7 +7893,7 @@ hp700-wy|HP700/41 emulating wyse30,
+@@ -7839,7 +7915,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,
@@ -749,7 +740,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,
-@@ -10951,6 +11027,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
+@@ -10973,6 +11049,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)
@@ -757,7 +748,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,
-@@ -10960,7 +11037,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
+@@ -10982,7 +11059,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=^J, cuf=\E[%p1%dC, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@@ -766,7 +757,7 @@
dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
flash=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l,
fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
-@@ -15236,7 +15313,7 @@ ibm3101|i3101|IBM 3101-10,
+@@ -15258,7 +15335,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=^J, kcub1=\ED, kcud1=\EB,
kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH,
@@ -775,7 +766,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%{80}%|%;%c%?%p9%t\E>A%e\E>B%;,
sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162,
-@@ -15466,7 +15543,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
+@@ -15499,7 +15576,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
tbc=\E[3g,
# "Megapel" refers to the display adapter, which was used with the IBM RT
# aka IBM 6150.
