Dr. Werner Fink 2013-09-30 10:59:28 +00:00 committed by Git OBS Bridge
parent 398ada86c0
commit e4e8ad181e
4 changed files with 66 additions and 66 deletions

View File

@ -1,6 +1,6 @@
--- tack/Makefile.in
+++ tack/Makefile.in 2012-03-05 11:30:45.001933741 +0000
@@ -98,7 +98,7 @@ ABI_VERSION = @cf_cv_abi_version@
+++ tack/Makefile.in 2012-03-05 11:30:45.000000000 +0000
@@ -93,7 +93,7 @@ ABI_VERSION = @cf_cv_abi_version@
LOCAL_LIBDIR = @top_builddir@/lib
LD = @LD@

View File

@ -1,6 +1,6 @@
--- man/curs_util.3x
+++ man/curs_util.3x 2012-07-20 15:36:56.188010145 +0000
@@ -159,6 +159,9 @@ ncurses modifies the last step in its co
+++ man/curs_util.3x 2012-07-20 15:36:56.000000000 +0000
@@ -167,6 +167,9 @@ ncurses modifies the last step in its co
checks if the \fBLINES\fR and \fBCOLUMNS\fR environment variables
are set to a number greater than zero.
.bP
@ -11,8 +11,8 @@
with the value that it has obtained via operating system call
or from the terminal database.
--- ncurses/tinfo/lib_data.c
+++ ncurses/tinfo/lib_data.c 2012-07-20 15:16:12.708010349 +0000
@@ -255,7 +255,7 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _n
+++ ncurses/tinfo/lib_data.c 2012-07-20 15:16:13.000000000 +0000
@@ -257,7 +257,7 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _n
NULL, /* _tputs_trace */
#endif
#endif

View File

@ -1,5 +1,5 @@
--- configure.in
+++ configure.in 2012-01-30 17:31:47.000000000 +0100
+++ configure.in 2012-01-30 16:31:47.000000000 +0000
@@ -436,6 +436,7 @@ AC_ARG_ENABLE(overwrite,
[with_overwrite=$enableval],
[if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi])
@ -9,12 +9,12 @@
AC_MSG_CHECKING(if external terminfo-database is used)
AC_ARG_ENABLE(database,
--- configure
+++ configure 2012-01-30 17:42:40.000000000 +0100
@@ -6345,6 +6345,7 @@ else
+++ configure 2013-09-30 09:17:51.710735838 +0000
@@ -6365,6 +6365,7 @@ else
fi;
echo "$as_me:6346: result: $with_overwrite" >&5
echo "$as_me:6366: result: $with_overwrite" >&5
echo "${ECHO_T}$with_overwrite" >&6
+WITH_OVERWRITE="$with_overwrite"
echo "$as_me:6349: checking if external terminfo-database is used" >&5
echo "$as_me:6369: checking if external terminfo-database is used" >&5
echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6

View File

@ -9,7 +9,7 @@
#include <stdio.h>
#if defined(__cplusplus)
@@ -4342,12 +4342,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4350,12 +4350,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source
cf_target="\$cf_source"
fi
@ -27,7 +27,7 @@
sed -f $cf_man_alias \\
CF_EOF
@@ -4357,7 +4360,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4365,7 +4368,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -36,7 +36,7 @@
CF_EOF
fi
@@ -4397,7 +4400,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4405,7 +4408,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -45,7 +45,7 @@
CF_EOF
fi
@@ -4406,23 +4409,23 @@ case "$MANPAGE_FORMAT" in #(vi
@@ -4414,23 +4417,23 @@ case "$MANPAGE_FORMAT" in #(vi
cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories
@ -75,7 +75,7 @@
for cf_alias in \$aliases
do
if test \$section = 1 ; then
@@ -4431,7 +4434,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4439,7 +4442,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then
@ -84,7 +84,7 @@
then
continue
fi
@@ -4441,18 +4444,18 @@ CF_EOF
@@ -4449,18 +4452,18 @@ CF_EOF
case "x$LN_S" in #(vi
*-f) #(vi
cat >>$cf_edit_man <<CF_EOF
@ -106,7 +106,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
@@ -4472,9 +4475,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4480,9 +4483,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@ -119,7 +119,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
@@ -4494,6 +4497,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4502,6 +4505,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -129,7 +129,7 @@
done
--- configure.in
+++ configure.in 2012-01-30 16:31:47.000000000 +0000
@@ -1763,6 +1763,7 @@ if test "$with_termlib" != no ; then
@@ -1792,6 +1792,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@ -139,7 +139,7 @@
TINFO_NAME=${LIB_NAME}
--- configure
+++ configure 2012-01-30 16:42:40.000000000 +0000
@@ -5399,7 +5399,7 @@ irix*) #(vi
@@ -5490,7 +5490,7 @@ irix*) #(vi
fi
;;
linux*|gnu*|k*bsd*-gnu) #(vi
@ -148,7 +148,7 @@
;;
openbsd[2-9].*|mirbsd*) #(vi
LD_RPATH_OPT="-Wl,-rpath,"
@@ -10623,12 +10623,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -10742,12 +10742,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source
cf_target="\$cf_source"
fi
@ -166,7 +166,7 @@
sed -f $cf_man_alias \\
CF_EOF
@@ -10638,7 +10641,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -10757,7 +10760,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -175,7 +175,7 @@
CF_EOF
fi
@@ -10678,7 +10681,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -10797,7 +10800,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -184,7 +184,7 @@
CF_EOF
fi
@@ -10687,23 +10690,23 @@ case "$MANPAGE_FORMAT" in #(vi
@@ -10806,23 +10809,23 @@ case "$MANPAGE_FORMAT" in #(vi
cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories
@ -214,7 +214,7 @@
for cf_alias in \$aliases
do
if test \$section = 1 ; then
@@ -10712,7 +10715,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -10831,7 +10834,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then
@ -223,7 +223,7 @@
then
continue
fi
@@ -10722,18 +10725,18 @@ CF_EOF
@@ -10841,18 +10844,18 @@ CF_EOF
case "x$LN_S" in #(vi
*-f) #(vi
cat >>$cf_edit_man <<CF_EOF
@ -245,7 +245,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
@@ -10753,9 +10756,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -10872,9 +10875,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@ -258,7 +258,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
@@ -10775,6 +10778,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -10894,6 +10897,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -266,7 +266,7 @@
;;
esac
done
@@ -20090,6 +20094,7 @@ if test "$with_termlib" != no ; then
@@ -20464,6 +20468,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@ -327,7 +327,7 @@
tack.1m tack.1
--- man/ncurses.3x
+++ man/ncurses.3x 2012-01-30 16:44:35.000000000 +0000
@@ -115,6 +115,10 @@ after the shell environment variable \fB
@@ -119,6 +119,10 @@ after the shell environment variable \fB
\fB@TSET@(1)\fR is usually responsible for doing this.
[See \fBterminfo\fR(\*n) for further details.]
.PP
@ -362,7 +362,7 @@
gn, use=dumb,
lpr|printer|line printer,
OTbs, hc, os,
@@ -1609,9 +1611,15 @@ linux-c|linux console 1.3.6+ for older n
@@ -1624,9 +1626,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 <frank@g-n-u.de>.
@ -379,7 +379,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
@@ -2911,6 +2919,7 @@ vt132|DEC vt132,
@@ -2926,6 +2934,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.
@ -387,7 +387,7 @@
#
# added msgr -TD
vt220-old|vt200-old|DEC VT220 in vt100 emulation mode,
@@ -2921,7 +2930,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e
@@ -2936,7 +2945,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,
@ -396,7 +396,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,
@@ -3078,6 +3087,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul.
@@ -3093,6 +3102,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul.
# to SMASH the 1k-barrier...
# From: Adam Thompson <athompso@pangea.ca> Sept 10 1995
# (vt320: uncommented <fsl> --esr)
@ -404,7 +404,7 @@
vt320|vt300|dec vt320 7 bit terminal,
am, hs, mir, msgr, xenl,
cols#80, lines#24, wsl#80,
@@ -3087,7 +3097,7 @@ vt320|vt300|dec vt320 7 bit terminal,
@@ -3102,7 +3112,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,
@ -413,7 +413,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,
@@ -3499,13 +3509,14 @@ putty-sco|putty with SCO function keys,
@@ -3514,13 +3524,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.
@ -429,7 +429,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~,
@@ -3708,6 +3719,7 @@ xterm-old|antique xterm version,
@@ -3723,6 +3734,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.
@ -437,7 +437,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@,
@@ -3717,7 +3729,7 @@ xterm-xf86-v32|xterm terminal emulator (
@@ -3732,7 +3744,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,
@ -446,7 +446,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,
@@ -4184,8 +4196,26 @@ xterm-noapp|xterm with cursor keys in no
@@ -4199,8 +4211,26 @@ xterm-noapp|xterm with cursor keys in no
xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
lines#24, use=xterm-old,
@ -473,7 +473,7 @@
use=xterm-new,
# This entry assumes that xterm's handling of VT100 SI/SO is disabled by
@@ -4391,7 +4421,7 @@ xterms-sun|small (80x24) xterm with sunF
@@ -4406,7 +4436,7 @@ xterms-sun|small (80x24) xterm with sunF
#### GNOME (VTE)
# this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
@ -482,7 +482,7 @@
bce,
kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
use=xterm-color,
@@ -4552,10 +4582,14 @@ mgt|Multi GNOME Terminal,
@@ -4567,10 +4597,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).
@ -498,7 +498,7 @@
# Konsole 1.0.1
# (formerly known as kvt)
#
@@ -4670,14 +4704,14 @@ konsole-256color|KDE console window with
@@ -4685,14 +4719,14 @@ konsole-256color|KDE console window with
mlterm|multi lingual terminal emulator,
am, eslok, km, mc5i, mir, msgr, npc, xenl, XT,
colors#8, cols#80, it#8, lines#24, pairs#64,
@ -516,7 +516,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>,
@@ -4732,6 +4766,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
@@ -4747,6 +4781,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".
@ -524,7 +524,7 @@
#
# removed dch/dch1 because they are inconsistent with bce/ech -TD
# remove km as per tack test -TD
@@ -4743,13 +4778,14 @@ rxvt-basic|rxvt terminal base (X Window
@@ -4758,13 +4793,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,
@ -542,7 +542,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,
@@ -4758,7 +4794,7 @@ rxvt-basic|rxvt terminal base (X Window
@@ -4773,7 +4809,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,
@ -551,7 +551,7 @@
# Key Codes from rxvt reference:
#
# Note: Shift + F1-F10 generates F11-F20
@@ -4841,8 +4877,8 @@ rxvt-basic|rxvt terminal base (X Window
@@ -4856,8 +4892,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,
@ -562,7 +562,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~,
@@ -4880,6 +4916,39 @@ rxvt-cygwin-native|rxvt terminal emulato
@@ -4895,6 +4931,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,
@ -602,7 +602,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,
@@ -4909,7 +4978,7 @@ mrxvt-256color|multitabbed rxvt with 256
@@ -4924,7 +4993,7 @@ mrxvt-256color|multitabbed rxvt with 256
# Eterm 0.9.3
#
# removed kf0 which conflicts with kf10 -TD
@ -611,7 +611,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
@@ -4923,13 +4992,13 @@ Eterm|Eterm-color|Eterm with xterm-style
@@ -4938,13 +5007,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,
@ -627,7 +627,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=,
@@ -5360,7 +5429,7 @@ pty|4bsd pseudo teletype,
@@ -5375,7 +5444,7 @@ pty|4bsd pseudo teletype,
#### Emacs
# The codes supported by the term.el terminal emulation in GNU Emacs 19.30
@ -636,7 +636,7 @@
am, mir, xenl,
cols#80, lines#24,
bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M,
@@ -5373,6 +5442,13 @@ eterm|gnu emacs term.el terminal emulati
@@ -5388,6 +5457,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,
@ -650,7 +650,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,
@@ -5423,7 +5499,7 @@ screen|VT 100/ANSI X3.64 virtual termina
@@ -5438,7 +5514,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@,
@ -659,7 +659,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,
@@ -5602,7 +5678,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
@@ -5617,7 +5693,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,
@ -668,7 +668,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,
@@ -7336,7 +7412,7 @@ hp700-wy|HP700/41 emulating wyse30,
@@ -7351,7 +7427,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,
@ -677,7 +677,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,
@@ -10470,6 +10546,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
@@ -10485,6 +10561,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
# at support for the VT320 itself.
# Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
# (vt320-k3: I added <rmam>/<smam> based on the init string -- esr)
@ -685,7 +685,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,
@@ -10479,7 +10556,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
@@ -10494,7 +10571,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,
@ -694,7 +694,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,
@@ -14755,7 +14832,7 @@ ibm3101|i3101|IBM 3101-10,
@@ -14770,7 +14847,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,
@ -703,7 +703,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,
@@ -14985,7 +15062,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
@@ -15000,7 +15077,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.
@ -714,7 +714,7 @@
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
--- ncurses/Makefile.in
+++ ncurses/Makefile.in 2011-02-28 13:39:31.000000000 +0000
@@ -207,7 +207,7 @@ $(DESTDIR)$(libdir) :
@@ -211,7 +211,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@
./fallback.c : $(tinfo)/MKfallback.sh
@ -725,7 +725,7 @@
sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
--- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2006-05-18 14:07:15.000000000 +0000
@@ -1977,6 +1977,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_
@@ -1993,6 +1993,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_
extern NCURSES_EXPORT(char *) _nc_tracechar (SCREEN *, int);
extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
extern NCURSES_EXPORT(int) _nc_access (const char *, int);
@ -838,7 +838,7 @@
} else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2011-02-28 13:41:44.000000000 +0000
@@ -374,6 +374,7 @@ _nc_read_file_entry(const char *const fi
@@ -404,6 +404,7 @@ _nc_read_file_entry(const char *const fi
int limit;
char buffer[MAX_ENTRY_SIZE + 1];
@ -846,7 +846,7 @@
if (_nc_access(filename, R_OK) < 0
|| (fp = fopen(filename, "rb")) == 0) {
TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
@@ -391,6 +392,7 @@ _nc_read_file_entry(const char *const fi
@@ -421,6 +422,7 @@ _nc_read_file_entry(const char *const fi
}
fclose(fp);
}
@ -882,7 +882,7 @@
myfd = TRUE;
}
lineno = 0;
@@ -1119,8 +1123,10 @@ _nc_read_termcap_entry(const char *const
@@ -1117,8 +1121,10 @@ _nc_read_termcap_entry(const char *const
for (i = 0; i < filecount; i++) {
TR(TRACE_DATABASE, ("Looking for %s in %s", tn, termpaths[i]));
@ -893,7 +893,7 @@
_nc_set_source(termpaths[i]);
/*
@@ -1132,6 +1138,7 @@ _nc_read_termcap_entry(const char *const
@@ -1130,6 +1136,7 @@ _nc_read_termcap_entry(const char *const
(void) fclose(fp);
}
@ -903,7 +903,7 @@
if (copied != 0)
--- test/test.priv.h
+++ test/test.priv.h 2006-05-18 14:07:19.000000000 +0000
@@ -677,12 +677,12 @@ extern char *strnames[], *strcodes[], *s
@@ -696,12 +696,12 @@ extern char *strnames[], *strcodes[], *s
#endif
/* out-of-band values for representing absent capabilities */