Hello community,
here is the log from the commit of package ncurses for openSUSE:12.2 checked in
at 2012-07-31 14:04:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/ncurses (Old)
and /work/SRC/openSUSE:12.2/.ncurses.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses", Maintainer is "wer...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.2/ncurses/ncurses.changes 2012-06-25
15:46:55.000000000 +0200
+++ /work/SRC/openSUSE:12.2/.ncurses.new/ncurses.changes 2012-07-31
14:15:38.000000000 +0200
@@ -1,0 +2,59 @@
+Fri Jul 20 15:12:43 UTC 2012 - wer...@suse.de
+
+- Add ncurses patch 5.9.20120714 (bnc#769788)
+ + add use_tioctl() function (adapted from patch by Werner Fink,
+ Novell #769788):
+- Set the default for use_tioctl() to TRUE and add a note in the
+ manual page for this.
+
+-------------------------------------------------------------------
+Mon Jul 9 12:51:19 UTC 2012 - wer...@suse.de
+
+- Add ncurses patch 5.9.20120707 (bnc#769788)
+ + add ncurses_mingw.h to installed headers (prompted by patch by
+ Juergen Pfeifer).
+ + clarify return-codes from wgetch() in response to SIGWINCH (prompted
+ by Novell #769788).
+ + modify resizeterm() to always push a KEY_RESIZE onto the fifo, even
+ if screensize is unchanged. Modify _nc_update_screensize() to push a
+ KEY_RESIZE if there was a SIGWINCH, even if it does not call
+ resizeterm(). These changes eliminate the case where a SIGWINCH is
+ received, but ERR returned from wgetch or wgetnstr because the screen
+ dimensions did not change (Novell #769788).
+
+-------------------------------------------------------------------
+Tue Jun 26 10:41:46 UTC 2012 - wer...@suse.de
+
+- Add ncurses patch 5.9.20120622
+ + add -d, -e and -q options to test/demo_terminfo and test/demo_termcap
+ + fix caching of environment variables in database-iterator (patch by
+ Philippe Troin, Redhat #831366).
+- Add ncurses patch 5.9.20120616
+ + add configure check to distinguish clang from gcc to eliminate
+ warnings about unused command-line parameters when compiler warnings
+ are enabled.
+ + improve behavior when updating terminfo entries which are hardlinked
+ by allowing for the possibility that an alias has been repurposed to
+ a new primary name.
+ + fix some strict compiler warnings based on package scripts.
+ + further fixes for configure check for working poll (Debian #676461).
+- Add ncurses patch 5.9.20120608
+ + fix an uninitialized variable in -c/-n logic for infocmp changes
+ (cf: 20120526).
+- Add ncurses patch 5.9.20120602
+ + add kdch1 aka "Remove" to vt220 and vt220-8 entries -TD
+ + add kdch1, etc., to qvt108 -TD
+ + add dl1/il1 to some entries based on dl/il values -TD
+ + add dl to simpleterm -TD
+ + add consistency-checks in tic for insert-line vs delete-line
+ controls, and insert/delete-char keys
+ + correct no-leaks logic in infocmp when doing comparisons, fixing
+ duplicate free of entries given via the command-line, and freeing
+ entries loaded from the last-but-one of files specified on the
+ command-line.
+ + add kdch1 to wsvt25 entry from NetBSD CVS (reported by David Lord,
+ analysis by Martin Husemann).
+ + add cnorm/civis to wsvt25 entry from NetBSD CVS (report/analysis by
+ Onno van der Linden).
+
+-------------------------------------------------------------------
New:
----
ncurses-5.9-environment.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ncurses.spec ++++++
--- /var/tmp/diff_new_pack.pdjdND/_old 2012-07-31 14:15:46.000000000 +0200
+++ /var/tmp/diff_new_pack.pdjdND/_new 2012-07-31 14:15:46.000000000 +0200
@@ -48,6 +48,7 @@
Patch0: ncurses-%{version}.dif
Patch3: ncurses-5.9-overwrite.dif
Patch4: ncurses-5.7-tack.dif
+Patch5: ncurses-5.9-environment.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _miscdir %{_datadir}/misc
@@ -262,6 +263,7 @@
mv tack-* tack
%patch -P 3 -p0 -b .ow
%patch -P 4 -p0 -b .hs
+%patch -P 5 -p0 -b .lc
%patch -P 0 -p0 -b .p0
rm -vf include/ncurses_dll.h
rm -vf mkdirs.sh
++++++ ncurses-5.9-environment.dif ++++++
--- 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
checks if the \fBLINES\fR and \fBCOLUMNS\fR environment variables
are set to a number greater than zero.
.bP
+On openSUSE/SUSE Linux the default is \fBTRUE\fR, if you do not want this
+feature you may use the \fBuse_tioctl\fR routine with \fBFALSE\fR as an
argument.
+.bP
for each, ncurses updates the corresponding environment variable
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
NULL, /* _tputs_trace */
#endif
#endif
- FALSE, /* use_tioctl */
+ TRUE, /* use_tioctl */
};
/* *INDENT-ON* */
++++++ ncurses-5.9-patches.tar.bz2 ++++++
++++ 31257 lines of diff (skipped)
++++++ ncurses-5.9.dif ++++++
--- /var/tmp/diff_new_pack.pdjdND/_old 2012-07-31 14:15:46.000000000 +0200
+++ /var/tmp/diff_new_pack.pdjdND/_new 2012-07-31 14:15:46.000000000 +0200
@@ -9,7 +9,7 @@
#include <stdio.h>
#if defined(__cplusplus)
-@@ -4172,12 +4172,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4339,12 +4339,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
-@@ -4187,7 +4190,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4354,7 +4357,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@@ -36,7 +36,7 @@
CF_EOF
fi
-@@ -4227,7 +4230,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4394,7 +4397,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@@ -45,7 +45,7 @@
CF_EOF
fi
-@@ -4236,23 +4239,23 @@ case "$MANPAGE_FORMAT" in #(vi
+@@ -4403,23 +4406,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
-@@ -4261,7 +4264,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4428,7 +4431,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
-@@ -4271,18 +4274,18 @@ CF_EOF
+@@ -4438,18 +4441,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
-@@ -4302,9 +4305,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4469,9 +4472,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@@ -119,7 +119,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
-@@ -4324,6 +4327,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4491,6 +4494,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@@ -128,8 +128,8 @@
esac
done
--- configure.in
-+++ configure.in 2012-01-30 16:31:46.955146248 +0000
-@@ -1732,6 +1732,7 @@ if test "$with_termlib" != no ; then
++++ configure.in 2012-01-30 16:31:47.000000000 +0000
+@@ -1754,6 +1754,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@@ -138,8 +138,8 @@
# the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME}
--- configure
-+++ configure 2012-01-30 17:42:40.000000000 +0100
-@@ -5565,7 +5565,7 @@ irix*) #(vi
++++ configure 2012-01-30 16:42:40.000000000 +0000
+@@ -5372,7 +5372,7 @@ irix*) #(vi
fi
;;
linux*|gnu*|k*bsd*-gnu) #(vi
@@ -148,7 +148,7 @@
;;
openbsd[2-9].*|mirbsd*) #(vi
LD_RPATH_OPT="-Wl,-rpath,"
-@@ -10662,12 +10662,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -10512,12 +10512,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
-@@ -10677,7 +10680,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -10527,7 +10530,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@@ -175,7 +175,7 @@
CF_EOF
fi
-@@ -10717,7 +10720,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -10567,7 +10570,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@@ -184,7 +184,7 @@
CF_EOF
fi
-@@ -10726,23 +10729,23 @@ case "$MANPAGE_FORMAT" in #(vi
+@@ -10576,23 +10579,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
-@@ -10751,7 +10754,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -10601,7 +10604,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
-@@ -10761,18 +10764,18 @@ CF_EOF
+@@ -10611,18 +10614,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
-@@ -10792,9 +10795,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -10642,9 +10645,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@@ -258,7 +258,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
-@@ -10814,6 +10817,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -10664,6 +10667,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@@ -266,7 +266,7 @@
;;
esac
done
-@@ -19924,6 +19928,7 @@ if test "$with_termlib" != no ; then
+@@ -20032,6 +20036,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@@ -276,7 +276,7 @@
TINFO_NAME=${LIB_NAME}
--- include/curses.h.in
+++ include/curses.h.in 2010-10-11 13:57:42.000000000 +0000
-@@ -144,6 +144,9 @@ typedef unsigned @cf_cv_typeof_chtype@ c
+@@ -151,6 +151,9 @@ typedef unsigned @cf_cv_typeof_chtype@ c
typedef unsigned @cf_cv_typeof_mmask_t@ mmask_t;
#endif
@@ -298,7 +298,7 @@
#undef NCURSES_CONST
--- include/tic.h
-+++ include/tic.h 2012-05-31 12:15:29.304332427 +0000
++++ include/tic.h 2012-05-31 12:15:29.000000000 +0000
@@ -231,12 +231,12 @@ extern NCURSES_EXPORT(const struct alias
*/
@@ -326,7 +326,7 @@
# Other:
tack.1m tack.1
--- man/ncurses.3x
-+++ man/ncurses.3x 2012-01-30 16:44:35.439646557 +0000
++++ man/ncurses.3x 2012-01-30 16:44:35.000000000 +0000
@@ -113,6 +113,10 @@ after the shell environment variable \fB
\fB@TSET@(1)\fR is usually responsible for doing this.
[See \fBterminfo\fR(\*n) for further details.]
@@ -350,7 +350,7 @@
fi
if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src
-+++ misc/terminfo.src 2012-05-31 12:25:37.484009982 +0000
++++ misc/terminfo.src 2012-06-26 10:48:22.676510628 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am,
cols#80,
@@ -362,7 +362,7 @@
gn, use=dumb,
lpr|printer|line printer,
OTbs, hc, os,
-@@ -942,9 +944,15 @@ linux-c|linux console 1.3.6+ for older n
+@@ -943,9 +945,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>.
@@ -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
-@@ -2469,6 +2477,7 @@ vt132|DEC vt132,
+@@ -2471,6 +2479,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,
-@@ -2479,7 +2488,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e
+@@ -2481,7 +2490,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,
-@@ -2628,6 +2637,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul.
+@@ -2638,6 +2647,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)
@@ -404,7 +404,7 @@
vt320|vt300|dec vt320 7 bit terminal,
am, hs, mir, msgr, xenl,
cols#80, lines#24, wsl#80,
-@@ -2637,7 +2647,7 @@ vt320|vt300|dec vt320 7 bit terminal,
+@@ -2647,7 +2657,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,
-@@ -3048,13 +3058,14 @@ putty-sco|putty with SCO function keys,
+@@ -3058,13 +3068,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~,
-@@ -3255,6 +3266,7 @@ xterm-r6|xterm-old|xterm X11R6 version,
+@@ -3265,6 +3276,7 @@ xterm-r6|xterm-old|xterm X11R6 version,
use=vt100+enq,
# 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@,
-@@ -3264,7 +3276,7 @@ xterm-xf86-v32|xterm terminal emulator (
+@@ -3274,7 +3286,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,
-@@ -3731,8 +3743,26 @@ xterm-noapp|xterm with cursor keys in no
+@@ -3741,8 +3753,26 @@ xterm-noapp|xterm with cursor keys in no
xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
lines#24, use=xterm,
@@ -473,7 +473,7 @@
use=xterm-new,
# This entry assumes that xterm's handling of VT100 SI/SO is disabled by
-@@ -3938,7 +3968,7 @@ xterms-sun|small (80x24) xterm with sunF
+@@ -3948,7 +3978,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,
-@@ -4086,10 +4116,14 @@ mgt|Multi GNOME Terminal,
+@@ -4096,10 +4126,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)
#
-@@ -4205,14 +4239,14 @@ konsole-256color|KDE console window with
+@@ -4214,14 +4248,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>,
-@@ -4267,6 +4301,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
+@@ -4276,6 +4310,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
-@@ -4278,13 +4313,14 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -4287,13 +4322,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,
-@@ -4293,7 +4329,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -4302,7 +4338,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
-@@ -4376,8 +4412,8 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -4385,8 +4421,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~,
-@@ -4415,6 +4451,39 @@ rxvt-cygwin-native|rxvt terminal emulato
+@@ -4424,6 +4460,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,
-@@ -4444,7 +4513,7 @@ mrxvt-256color|multitabbed rxvt with 256
+@@ -4453,7 +4522,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
-@@ -4458,13 +4527,13 @@ Eterm|Eterm-color|Eterm with xterm-style
+@@ -4467,13 +4536,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=,
-@@ -4893,7 +4962,7 @@ pty|4bsd pseudo teletype,
+@@ -4902,7 +4971,7 @@ pty|4bsd pseudo teletype,
smso=\Ea$, smul=\Ea!, use=cbunix,
# 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,
-@@ -4906,6 +4975,13 @@ eterm|gnu emacs term.el terminal emulati
+@@ -4915,6 +4984,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,
-@@ -4954,7 +5030,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -4963,7 +5039,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,
-@@ -5133,7 +5209,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
+@@ -5142,7 +5218,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,
-@@ -6857,7 +6933,7 @@ hp700-wy|HP700/41 emulating wyse30,
+@@ -6866,7 +6942,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,
-@@ -9988,6 +10064,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
+@@ -10000,6 +10076,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)
@@ -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,
-@@ -9997,7 +10074,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
+@@ -10009,7 +10086,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,
-@@ -14273,7 +14350,7 @@ ibm3101|i3101|IBM 3101-10,
+@@ -14285,7 +14362,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,10 +703,10 @@
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,
-@@ -14501,7 +14578,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
-
sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
- sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+@@ -14515,7 +14592,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.
-ibm5081|hft|IBM Megapel Color display,
+ibm5081|ibmmpel|hft|IBM Megapel Color display,
acsc=jjkkllmmnnqqttuuvvwwxx, blink@, bold@, s0ds=\E(B,
@@ -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
-@@ -1935,6 +1935,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_
+@@ -1948,6 +1948,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);
@@ -882,7 +882,7 @@
myfd = TRUE;
}
lineno = 0;
-@@ -1115,8 +1119,10 @@ _nc_read_termcap_entry(const char *const
+@@ -1119,8 +1123,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]);
/*
-@@ -1128,6 +1134,7 @@ _nc_read_termcap_entry(const char *const
+@@ -1132,6 +1138,7 @@ _nc_read_termcap_entry(const char *const
(void) fclose(fp);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
