|
|
|
@@ -21,7 +21,7 @@
|
|
|
|
|
19 files changed, 248 insertions(+), 80 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- aclocal.m4
|
|
|
|
|
+++ aclocal.m4 2019-02-06 07:51:48.441355403 +0000
|
|
|
|
|
+++ aclocal.m4 2019-04-01 07:18:56.549107037 +0000
|
|
|
|
|
@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
|
|
|
|
|
AC_CACHE_VAL(cf_cv_type_of_bool,[
|
|
|
|
|
rm -f cf_test.out
|
|
|
|
@@ -31,7 +31,7 @@
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
|
|
#if defined(__cplusplus)
|
|
|
|
|
@@ -4950,12 +4950,15 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -4993,12 +4993,15 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
echo '? missing rename for '\$cf_source
|
|
|
|
|
cf_target="\$cf_source"
|
|
|
|
|
fi
|
|
|
|
@@ -49,7 +49,7 @@
|
|
|
|
|
sed -f $cf_man_alias \\
|
|
|
|
|
CF_EOF
|
|
|
|
|
|
|
|
|
|
@@ -4965,7 +4968,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -5008,7 +5011,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
CF_EOF
|
|
|
|
|
else
|
|
|
|
|
cat >>$cf_edit_man <<CF_EOF
|
|
|
|
@@ -58,7 +58,7 @@
|
|
|
|
|
CF_EOF
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@@ -5005,7 +5008,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -5048,7 +5051,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
mv \$TMP.$cf_so_strip \$TMP
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
@@ -67,7 +67,7 @@
|
|
|
|
|
CF_EOF
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@@ -5014,23 +5017,23 @@ case "$MANPAGE_FORMAT" in
|
|
|
|
|
@@ -5057,23 +5060,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
|
|
|
|
@@ -97,7 +97,7 @@
|
|
|
|
|
for cf_alias in \$aliases
|
|
|
|
|
do
|
|
|
|
|
if test \$section = 1 ; then
|
|
|
|
|
@@ -5039,7 +5042,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -5082,7 +5085,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
|
|
|
|
|
if test "$MANPAGE_SYMLINKS" = yes ; then
|
|
|
|
|
if test -f \$cf_alias\${suffix} ; then
|
|
|
|
@@ -106,7 +106,7 @@
|
|
|
|
|
then
|
|
|
|
|
continue
|
|
|
|
|
fi
|
|
|
|
|
@@ -5049,18 +5052,18 @@ CF_EOF
|
|
|
|
|
@@ -5092,18 +5095,18 @@ CF_EOF
|
|
|
|
|
case "x$LN_S" in
|
|
|
|
|
(*-f)
|
|
|
|
|
cat >>$cf_edit_man <<CF_EOF
|
|
|
|
@@ -128,7 +128,7 @@
|
|
|
|
|
echo ".so \$cf_source" >\$TMP
|
|
|
|
|
CF_EOF
|
|
|
|
|
if test -n "$cf_compress" ; then
|
|
|
|
|
@@ -5080,9 +5083,9 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -5123,9 +5126,9 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
elif test \$verb = removing ; then
|
|
|
|
@@ -141,7 +141,7 @@
|
|
|
|
|
)
|
|
|
|
|
test -d \$cf_subdir\${section} &&
|
|
|
|
|
test -n "\$aliases" && (
|
|
|
|
|
@@ -5102,6 +5105,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -5145,6 +5148,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
# echo ".hy 0"
|
|
|
|
|
cat \$TMP
|
|
|
|
|
fi
|
|
|
|
@@ -150,7 +150,7 @@
|
|
|
|
|
esac
|
|
|
|
|
done
|
|
|
|
|
--- configure
|
|
|
|
|
+++ configure 2019-02-06 07:51:48.445355328 +0000
|
|
|
|
|
+++ configure 2019-04-01 07:18:56.549107037 +0000
|
|
|
|
|
@@ -5485,7 +5485,7 @@ echo $ECHO_N "checking for an rpath opti
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
@@ -278,7 +278,7 @@
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
done
|
|
|
|
|
@@ -24439,6 +24443,7 @@ if test "$with_termlib" != no ; then
|
|
|
|
|
@@ -24511,6 +24515,7 @@ if test "$with_termlib" != no ; then
|
|
|
|
|
TINFO_LDFLAGS="-L${LIB_DIR}"
|
|
|
|
|
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
|
|
|
|
|
fi
|
|
|
|
@@ -287,7 +287,7 @@
|
|
|
|
|
# the next lines are needed for linking libtic over libncurses
|
|
|
|
|
TINFO_NAME=${LIB_NAME}
|
|
|
|
|
--- include/curses.h.in
|
|
|
|
|
+++ include/curses.h.in 2019-02-06 07:51:48.445355328 +0000
|
|
|
|
|
+++ include/curses.h.in 2019-04-01 07:18:56.549107037 +0000
|
|
|
|
|
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
|
|
|
|
|
typedef @cf_cv_typeof_mmask_t@ mmask_t;
|
|
|
|
|
#endif
|
|
|
|
@@ -299,7 +299,7 @@
|
|
|
|
|
* We need FILE, etc. Include this before checking any feature symbols.
|
|
|
|
|
*/
|
|
|
|
|
--- include/termcap.h.in
|
|
|
|
|
+++ include/termcap.h.in 2019-02-06 07:51:48.445355328 +0000
|
|
|
|
|
+++ include/termcap.h.in 2019-04-01 07:18:56.549107037 +0000
|
|
|
|
|
@@ -46,6 +46,8 @@ extern "C"
|
|
|
|
|
{
|
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
@@ -310,8 +310,8 @@
|
|
|
|
|
|
|
|
|
|
#undef NCURSES_OSPEED
|
|
|
|
|
--- include/tic.h
|
|
|
|
|
+++ include/tic.h 2019-02-06 07:51:48.445355328 +0000
|
|
|
|
|
@@ -236,12 +236,12 @@ struct alias
|
|
|
|
|
+++ include/tic.h 2019-04-01 07:18:56.549107037 +0000
|
|
|
|
|
@@ -236,12 +236,12 @@ struct user_table_entry
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* out-of-band values for representing absent capabilities */
|
|
|
|
@@ -327,7 +327,7 @@
|
|
|
|
|
#define CANCELLED_STRING (char *)(-1)
|
|
|
|
|
|
|
|
|
|
--- man/man_db.renames
|
|
|
|
|
+++ man/man_db.renames 2019-02-06 07:51:48.445355328 +0000
|
|
|
|
|
+++ man/man_db.renames 2019-04-01 07:18:56.549107037 +0000
|
|
|
|
|
@@ -163,6 +163,7 @@ term.7 term.7
|
|
|
|
|
term_variables.3x terminfo_variables.3ncurses
|
|
|
|
|
terminfo.5 terminfo.5
|
|
|
|
@@ -345,7 +345,7 @@
|
|
|
|
|
#
|
|
|
|
|
getty.1 getty.8
|
|
|
|
|
--- man/ncurses.3x
|
|
|
|
|
+++ man/ncurses.3x 2019-02-06 07:51:48.445355328 +0000
|
|
|
|
|
+++ man/ncurses.3x 2019-04-01 07:18:56.553106962 +0000
|
|
|
|
|
@@ -139,6 +139,10 @@ after the shell environment variable \fB
|
|
|
|
|
[See \fBterminfo\fR(\*n) for further details.]
|
|
|
|
|
.SS Datatypes
|
|
|
|
@@ -358,7 +358,7 @@
|
|
|
|
|
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 2019-02-06 07:51:48.445355328 +0000
|
|
|
|
|
+++ misc/gen-pkgconfig.in 2019-04-01 07:18:56.553106962 +0000
|
|
|
|
|
@@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
@@ -398,7 +398,7 @@
|
|
|
|
|
|
|
|
|
|
if test $name = $MAIN_LIBRARY
|
|
|
|
|
--- misc/terminfo.src
|
|
|
|
|
+++ misc/terminfo.src 2019-02-06 07:51:48.453355178 +0000
|
|
|
|
|
+++ misc/terminfo.src 2019-04-01 07:18:56.553106962 +0000
|
|
|
|
|
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
|
|
|
|
|
am,
|
|
|
|
|
cols#80,
|
|
|
|
@@ -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,
|
|
|
|
|
@@ -9042,7 +9125,7 @@ hp700-wy|HP700/41 emulating wyse30,
|
|
|
|
|
@@ -9066,7 +9149,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,
|
|
|
|
|
@@ -12273,6 +12356,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
|
|
|
|
|
@@ -12297,6 +12380,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)
|
|
|
|
@@ -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,
|
|
|
|
|
@@ -12282,7 +12366,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
|
|
|
|
|
@@ -12306,7 +12390,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,
|
|
|
|
|
@@ -16700,7 +16784,7 @@ ibm3101|i3101|IBM 3101-10,
|
|
|
|
|
@@ -16724,7 +16808,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
|
|
|
|
|
@@ -16958,7 +17042,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
|
|
|
|
|
@@ -16982,7 +17066,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.
|
|
|
|
@@ -783,7 +783,7 @@
|
|
|
|
|
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
|
|
|
|
|
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
|
|
|
|
|
--- ncurses/Makefile.in
|
|
|
|
|
+++ ncurses/Makefile.in 2019-02-06 07:51:48.453355178 +0000
|
|
|
|
|
+++ ncurses/Makefile.in 2019-04-01 07:18:56.553106962 +0000
|
|
|
|
|
@@ -221,7 +221,7 @@ $(DESTDIR)$(libdir) :
|
|
|
|
|
../lib : ; mkdir $@
|
|
|
|
|
|
|
|
|
@@ -794,8 +794,8 @@
|
|
|
|
|
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
|
|
|
|
|
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
|
|
|
|
|
--- ncurses/curses.priv.h
|
|
|
|
|
+++ ncurses/curses.priv.h 2019-02-06 07:51:48.453355178 +0000
|
|
|
|
|
@@ -2224,6 +2224,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
|
|
|
|
|
+++ ncurses/curses.priv.h 2019-04-01 07:18:56.553106962 +0000
|
|
|
|
|
@@ -2229,6 +2229,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);
|
|
|
|
@@ -805,7 +805,7 @@
|
|
|
|
|
extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
|
|
|
|
|
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
|
|
|
|
|
--- ncurses/run_cmd.sh
|
|
|
|
|
+++ ncurses/run_cmd.sh 2019-02-06 07:51:48.453355178 +0000
|
|
|
|
|
+++ ncurses/run_cmd.sh 2019-04-01 07:18:56.553106962 +0000
|
|
|
|
|
@@ -0,0 +1,11 @@
|
|
|
|
|
+#!/bin/sh
|
|
|
|
|
+
|
|
|
|
@@ -819,7 +819,7 @@
|
|
|
|
|
+
|
|
|
|
|
+exec ${1+"$@"}
|
|
|
|
|
--- ncurses/tinfo/MKfallback.sh
|
|
|
|
|
+++ ncurses/tinfo/MKfallback.sh 2019-02-06 07:51:48.453355178 +0000
|
|
|
|
|
+++ ncurses/tinfo/MKfallback.sh 2019-04-01 07:18:56.553106962 +0000
|
|
|
|
|
@@ -68,6 +68,12 @@ else
|
|
|
|
|
tmp_info=
|
|
|
|
|
fi
|
|
|
|
@@ -852,7 +852,7 @@
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
--- ncurses/tinfo/access.c
|
|
|
|
|
+++ ncurses/tinfo/access.c 2019-02-06 08:09:01.662042242 +0000
|
|
|
|
|
+++ ncurses/tinfo/access.c 2019-04-01 07:18:56.553106962 +0000
|
|
|
|
|
@@ -30,6 +30,10 @@
|
|
|
|
|
* Author: Thomas E. Dickey *
|
|
|
|
|
****************************************************************************/
|
|
|
|
@@ -896,7 +896,7 @@
|
|
|
|
|
_nc_access(const char *path, int mode)
|
|
|
|
|
{
|
|
|
|
|
--- ncurses/tinfo/lib_setup.c
|
|
|
|
|
+++ ncurses/tinfo/lib_setup.c 2019-02-06 07:51:48.457355102 +0000
|
|
|
|
|
+++ ncurses/tinfo/lib_setup.c 2019-04-01 07:18:56.557106886 +0000
|
|
|
|
|
@@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
|
|
|
|
|
} else if ((value = tigetnum("U8")) >= 0) {
|
|
|
|
|
result = value; /* use extension feature */
|
|
|
|
@@ -908,7 +908,7 @@
|
|
|
|
|
result = 1; /* always broken */
|
|
|
|
|
} else if (strstr(env, "screen") != 0
|
|
|
|
|
--- ncurses/tinfo/read_entry.c
|
|
|
|
|
+++ ncurses/tinfo/read_entry.c 2019-02-06 07:51:48.457355102 +0000
|
|
|
|
|
+++ ncurses/tinfo/read_entry.c 2019-04-01 07:18:56.557106886 +0000
|
|
|
|
|
@@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi
|
|
|
|
|
FILE *fp = 0;
|
|
|
|
|
int code;
|
|
|
|
@@ -926,7 +926,7 @@
|
|
|
|
|
return (code);
|
|
|
|
|
}
|
|
|
|
|
--- ncurses/tinfo/read_termcap.c
|
|
|
|
|
+++ ncurses/tinfo/read_termcap.c 2019-02-06 07:51:48.457355102 +0000
|
|
|
|
|
+++ ncurses/tinfo/read_termcap.c 2019-04-01 07:18:56.557106886 +0000
|
|
|
|
|
@@ -322,14 +322,18 @@ _nc_getent(
|
|
|
|
|
*/
|
|
|
|
|
if (fd >= 0) {
|
|
|
|
@@ -973,7 +973,7 @@
|
|
|
|
|
}
|
|
|
|
|
if (copied != 0)
|
|
|
|
|
--- progs/Makefile.in
|
|
|
|
|
+++ progs/Makefile.in 2019-02-06 07:51:48.457355102 +0000
|
|
|
|
|
+++ progs/Makefile.in 2019-04-01 07:18:56.557106886 +0000
|
|
|
|
|
@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
|
|
|
|
|
CFLAGS_NORMAL = $(CCFLAGS)
|
|
|
|
|
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
|
|
|
|
@@ -993,8 +993,8 @@
|
|
|
|
|
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
|
|
|
|
|
|
|
|
|
|
--- test/test.priv.h
|
|
|
|
|
+++ test/test.priv.h 2019-02-06 07:51:48.457355102 +0000
|
|
|
|
|
@@ -944,12 +944,12 @@ extern char *strnames[], *strcodes[], *s
|
|
|
|
|
+++ test/test.priv.h 2019-04-01 07:18:56.557106886 +0000
|
|
|
|
|
@@ -960,12 +960,12 @@ extern char * _nc_strstr (const char *,
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* out-of-band values for representing absent capabilities */
|
|
|
|
|