Ignore:
Timestamp:
Feb 23, 2009, 5:42:30 AM (16 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
54f612f
Parents:
61a4c69
Message:

Update Ncurses to Patch -9

File:
1 moved

Legend:

Unmodified
Added
Removed
  • patches/ncurses-5.7-branch_update-9.patch

    r61a4c69 r2a64e8b  
    11Submitted By: Jim Gifford (jim at cross-lfs dot org)
    2 Date: 02-15-2009
     2Date: 02-22-2009
    33Initial Package Version: 5.7
    44Origin: Upstream
    55Upstream Status: Applied
    66Description: This is a branch update for NCurses-5.7, and should be
    7              rechecked periodically. This patch covers up to 5.7-20090214.
     7             rechecked periodically. This patch covers up to 5.7-20090221.
    88
    99diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4
    1010--- ncurses-5.7.orig/aclocal.m4 2008-10-25 15:15:32.000000000 -0700
    11 +++ ncurses-5.7/aclocal.m4      2009-02-15 23:21:19.692164827 -0800
     11+++ ncurses-5.7/aclocal.m4      2009-02-22 21:40:16.166419890 -0800
    1212@@ -1,5 +1,5 @@
    1313 dnl***************************************************************************
     
    886886diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in
    887887--- ncurses-5.7.orig/Ada95/gen/adacurses-config.in      2007-04-07 14:06:50.000000000 -0700
    888 +++ ncurses-5.7/Ada95/gen/adacurses-config.in   2009-02-15 23:21:14.347823438 -0800
     888+++ ncurses-5.7/Ada95/gen/adacurses-config.in   2009-02-22 21:40:06.801819807 -0800
    889889@@ -1,18 +1,47 @@
    890890 #! /bin/sh
     
    960960diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in
    961961--- ncurses-5.7.orig/Ada95/gen/Makefile.in      2008-10-04 15:58:31.000000000 -0700
    962 +++ ncurses-5.7/Ada95/gen/Makefile.in   2009-02-15 23:21:14.347823438 -0800
     962+++ ncurses-5.7/Ada95/gen/Makefile.in   2009-02-22 21:40:06.801819807 -0800
    963963@@ -1,5 +1,5 @@
    964964 ##############################################################################
     
    10161016diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in
    10171017--- ncurses-5.7.orig/Ada95/samples/Makefile.in  2006-12-17 08:45:02.000000000 -0800
    1018 +++ ncurses-5.7/Ada95/samples/Makefile.in       2009-02-15 23:21:14.347823438 -0800
     1018+++ ncurses-5.7/Ada95/samples/Makefile.in       2009-02-22 21:40:06.805818410 -0800
    10191019@@ -1,5 +1,5 @@
    10201020 ##############################################################################
     
    10551055diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in
    10561056--- ncurses-5.7.orig/Ada95/src/Makefile.in      2007-09-15 11:22:24.000000000 -0700
    1057 +++ ncurses-5.7/Ada95/src/Makefile.in   2009-02-15 23:21:14.347823438 -0800
     1057+++ ncurses-5.7/Ada95/src/Makefile.in   2009-02-22 21:40:06.805818410 -0800
    10581058@@ -1,5 +1,5 @@
    10591059 ##############################################################################
     
    11471147diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb
    11481148--- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb      2008-07-26 11:51:11.000000000 -0700
    1149 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2009-02-15 23:21:00.210918563 -0800
     1149+++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2009-02-22 21:39:52.800922475 -0800
    11501150@@ -35,8 +35,8 @@
    11511151 ------------------------------------------------------------------------------
     
    11701170diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc
    11711171--- ncurses-5.7.orig/c++/cursesw.cc     2007-12-15 15:01:57.000000000 -0800
    1172 +++ ncurses-5.7/c++/cursesw.cc  2009-02-15 23:21:00.214919122 -0800
     1172+++ ncurses-5.7/c++/cursesw.cc  2009-02-22 21:39:52.804923033 -0800
    11731173@@ -1,6 +1,6 @@
    11741174 // * this is for making emacs happy: -*-Mode: C++;-*-
     
    12071207diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in
    12081208--- ncurses-5.7.orig/c++/Makefile.in    2007-04-28 08:29:12.000000000 -0700
    1209 +++ ncurses-5.7/c++/Makefile.in 2009-02-15 23:21:09.899537365 -0800
     1209+++ ncurses-5.7/c++/Makefile.in 2009-02-22 21:40:02.885566699 -0800
    12101210@@ -1,6 +1,6 @@
    12111211-# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $
     
    12411241diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess
    12421242--- ncurses-5.7.orig/config.guess       2008-08-30 13:25:07.000000000 -0700
    1243 +++ ncurses-5.7/config.guess    2009-02-15 23:21:09.899537365 -0800
     1243+++ ncurses-5.7/config.guess    2009-02-22 21:40:02.885566699 -0800
    12441244@@ -4,7 +4,7 @@
    12451245 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
     
    13111311diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub
    13121312--- ncurses-5.7.orig/config.sub 2008-08-30 13:25:02.000000000 -0700
    1313 +++ ncurses-5.7/config.sub      2009-02-15 23:21:09.903537644 -0800
     1313+++ ncurses-5.7/config.sub      2009-02-22 21:40:02.885566699 -0800
    13141314@@ -4,7 +4,7 @@
    13151315 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
     
    13951395diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure
    13961396--- ncurses-5.7.orig/configure  2008-10-25 17:04:38.000000000 -0700
    1397 +++ ncurses-5.7/configure       2009-02-15 23:21:24.616480793 -0800
     1397+++ ncurses-5.7/configure       2009-02-22 21:40:17.902529403 -0800
    13981398@@ -1,7 +1,7 @@
    13991399 #! /bin/sh
     
    1328213282diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in
    1328313283--- ncurses-5.7.orig/configure.in       2008-10-18 07:53:32.000000000 -0700
    13284 +++ ncurses-5.7/configure.in    2009-02-15 23:21:24.616480793 -0800
     13284+++ ncurses-5.7/configure.in    2009-02-22 21:40:17.902529403 -0800
    1328513285@@ -1,5 +1,5 @@
    1328613286 dnl***************************************************************************
     
    1355013550diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk
    1355113551--- ncurses-5.7.orig/dist.mk    2008-11-01 17:58:38.000000000 -0700
    13552 +++ ncurses-5.7/dist.mk 2009-02-15 23:21:24.616480793 -0800
     13552+++ ncurses-5.7/dist.mk 2009-02-22 21:40:19.474632211 -0800
    1355313553@@ -25,7 +25,7 @@
    1355413554 # use or other dealings in this Software without prior written               #
     
    1355613556 ##############################################################################
    1355713557-# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $
    13558 +# $Id: dist.mk,v 1.686 2009/02/14 21:09:27 tom Exp $
     13558+# $Id: dist.mk,v 1.687 2009/02/21 21:20:20 tom Exp $
    1355913559 # Makefile for creating ncurses distributions.
    1356013560 #
     
    1356513565 NCURSES_MINOR = 7
    1356613566-NCURSES_PATCH = 20081102
    13567 +NCURSES_PATCH = 20090214
     13567+NCURSES_PATCH = 20090221
    1356813568 
    1356913569 # We don't append the patch to the version, since this only applies to releases
     
    1357113571diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c
    1357213572--- ncurses-5.7.orig/form/frm_driver.c  2008-10-18 09:25:00.000000000 -0700
    13573 +++ ncurses-5.7/form/frm_driver.c       2009-02-15 23:21:03.083101270 -0800
     13573+++ ncurses-5.7/form/frm_driver.c       2009-02-22 21:39:55.861116636 -0800
    1357413574@@ -32,7 +32,7 @@
    1357513575 
     
    1359113591diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in
    1359213592--- ncurses-5.7.orig/form/Makefile.in   2007-04-28 07:56:11.000000000 -0700
    13593 +++ ncurses-5.7/form/Makefile.in        2009-02-15 23:21:09.919538762 -0800
     13593+++ ncurses-5.7/form/Makefile.in        2009-02-22 21:40:02.905568096 -0800
    1359413594@@ -1,6 +1,6 @@
    1359513595-# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $
     
    1361013610 LD             = @LD@
    1361113611 LN_S           = @LN_S@
     13612diff -Naur ncurses-5.7.orig/include/capdefaults.c ncurses-5.7/include/capdefaults.c
     13613--- ncurses-5.7.orig/include/capdefaults.c      2008-08-04 05:33:42.000000000 -0700
     13614+++ ncurses-5.7/include/capdefaults.c   2009-02-22 21:40:19.474632211 -0800
     13615@@ -32,7 +32,7 @@
     13616  *     and: Thomas E. Dickey                        1996-on                 *
     13617  ****************************************************************************/
     13618 
     13619-/* $Id: capdefaults.c,v 1.13 2008/08/04 12:33:42 tom Exp $ */
     13620+/* $Id: capdefaults.c,v 1.14 2008/11/16 00:19:59 juergen Exp $ */
     13621 
     13622     /*
     13623      * Compute obsolete capabilities.  The reason this is an include file is
     13624@@ -44,11 +44,11 @@
     13625      * postprocess_termcap().
     13626      */
     13627 {
     13628-    char *sp;
     13629+    char *strp;
     13630     short capval;
     13631 
     13632 #define EXTRACT_DELAY(str) \
     13633-       (short) (sp = strchr(str, '*'), sp ? atoi(sp+1) : 0)
     13634+       (short) (strp = strchr(str, '*'), strp ? atoi(strp+1) : 0)
     13635 
     13636     /* current (4.4BSD) capabilities marked obsolete */
     13637     if (VALID_STRING(carriage_return)
    1361213638diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in
    1361313639--- ncurses-5.7.orig/include/curses.h.in        2008-08-30 13:11:29.000000000 -0700
    13614 +++ ncurses-5.7/include/curses.h.in     2009-02-15 23:21:24.620481072 -0800
     13640+++ ncurses-5.7/include/curses.h.in     2009-02-22 21:40:19.474632211 -0800
    1361513641@@ -1,5 +1,5 @@
    1361613642 /****************************************************************************
     
    1362513651 
    1362613652-/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */
    13627 +/* $Id: curses.h.in,v 1.193 2009/02/15 00:04:23 tom Exp $ */
     13653+/* $Id: curses.h.in,v 1.194 2009/02/21 22:44:41 tom Exp $ */
    1362813654 
    1362913655 #ifndef __NCURSES_H
     
    1369513721 extern NCURSES_EXPORT(int) standend (void);                            /* generated */
    1369613722 extern NCURSES_EXPORT(int) start_color (void);                         /* implemented */
    13697 @@ -856,23 +857,117 @@
     13723@@ -856,23 +857,119 @@
    1369813724  * These extensions provide access to information stored in the WINDOW even
    1369913725  * when NCURSES_OPAQUE is set:
     
    1378313809+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_shell_mode) (SCREEN*); /* implemented */
    1378413810+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ripoffline) (SCREEN*, int, int (*)(WINDOW *, int)); /* implemented */
     13811+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_init) (SCREEN*, const char *); /* implemented */
     13812+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_restore) (SCREEN*, const char *); /* implemented */
    1378513813+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_set) (SCREEN*, const char *); /* implemented */
    1378613814+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attroff) (SCREEN*, const chtype); /* implemented */
     
    1382513853 
    1382613854 #define NCURSES_ATTR_SHIFT       8
    13827 @@ -1173,7 +1268,7 @@
     13855@@ -1173,7 +1270,7 @@
    1382813856  *        It gives the ESC expire time in milliseconds.
    1382913857  *     b. ttytype is needed for backward compatibility
     
    1383613864diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail
    1383713865--- ncurses-5.7.orig/include/curses.tail        2008-07-05 13:20:38.000000000 -0700
    13838 +++ ncurses-5.7/include/curses.tail     2009-02-15 23:21:00.214919122 -0800
     13866+++ ncurses-5.7/include/curses.tail     2009-02-22 21:39:52.804923033 -0800
    1383913867@@ -1,4 +1,4 @@
    1384013868-/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */
     
    1385313881diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide
    1385413882--- ncurses-5.7.orig/include/curses.wide        2007-03-10 09:52:23.000000000 -0800
    13855 +++ ncurses-5.7/include/curses.wide     2009-02-15 23:21:01.799020254 -0800
     13883+++ ncurses-5.7/include/curses.wide     2009-02-22 21:39:54.289015784 -0800
    1385613884@@ -1,9 +1,11 @@
    1385713885-/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */
     
    1386913897diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL
    1387013898--- ncurses-5.7.orig/INSTALL    2008-11-02 13:13:51.000000000 -0800
    13871 +++ ncurses-5.7/INSTALL 2009-02-15 23:21:09.895537365 -0800
     13899+++ ncurses-5.7/INSTALL 2009-02-22 21:40:02.877566978 -0800
    1387213900@@ -1,5 +1,5 @@
    1387313901 -------------------------------------------------------------------------------
     
    1392013948diff -Naur ncurses-5.7.orig/man/curs_color.3x ncurses-5.7/man/curs_color.3x
    1392113949--- ncurses-5.7.orig/man/curs_color.3x  2005-12-17 16:00:37.000000000 -0800
    13922 +++ ncurses-5.7/man/curs_color.3x       2009-02-15 23:21:17.376018158 -0800
     13950+++ ncurses-5.7/man/curs_color.3x       2009-02-22 21:40:14.670322949 -0800
    1392313951@@ -1,5 +1,5 @@
    1392413952 .\"***************************************************************************
     
    1395113979diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x
    1395213980--- ncurses-5.7.orig/man/curs_mouse.3x  2006-12-30 15:43:34.000000000 -0800
    13953 +++ ncurses-5.7/man/curs_mouse.3x       2009-02-15 23:21:00.214919122 -0800
     13981+++ ncurses-5.7/man/curs_mouse.3x       2009-02-22 21:39:52.804923033 -0800
    1395413982@@ -1,6 +1,6 @@
    1395513983 '\" t
     
    1399714025diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x
    1399814026--- ncurses-5.7.orig/man/keybound.3x    2006-02-25 13:47:06.000000000 -0800
    13999 +++ ncurses-5.7/man/keybound.3x 2009-02-15 23:21:04.663202123 -0800
     14027+++ ncurses-5.7/man/keybound.3x 2009-02-22 21:39:57.593227825 -0800
    1400014028@@ -1,5 +1,5 @@
    1400114029 .\"***************************************************************************
     
    1401814046diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1
    1401914047--- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800
    14020 +++ ncurses-5.7/man/tabs.1      2009-02-15 23:20:58.758823578 -0800
     14048+++ ncurses-5.7/man/tabs.1      2009-02-22 21:39:51.140814638 -0800
    1402114049@@ -0,0 +1,143 @@
    1402214050+.\"***************************************************************************
     
    1416514193diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1
    1416614194--- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800
    14167 +++ ncurses-5.7/man/tset.1      2009-02-15 23:20:58.758823578 -0800
     14195+++ ncurses-5.7/man/tset.1      2009-02-22 21:39:51.140814638 -0800
    1416814196@@ -1,5 +1,5 @@
    1416914197 .\"***************************************************************************
     
    1418614214diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST
    1418714215--- ncurses-5.7.orig/MANIFEST   2008-10-25 16:47:24.000000000 -0700
    14188 +++ ncurses-5.7/MANIFEST        2009-02-15 23:21:09.895537365 -0800
     14216+++ ncurses-5.7/MANIFEST        2009-02-22 21:40:02.877566978 -0800
    1418914217@@ -640,6 +640,7 @@
    1419014218 ./man/ncurses.3x
     
    1422914257diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in
    1423014258--- ncurses-5.7.orig/menu/Makefile.in   2007-04-28 07:56:11.000000000 -0700
    14231 +++ ncurses-5.7/menu/Makefile.in        2009-02-15 23:21:09.919538762 -0800
     14259+++ ncurses-5.7/menu/Makefile.in        2009-02-22 21:40:02.905568096 -0800
    1423214260@@ -1,6 +1,6 @@
    1423314261-# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $
     
    1425014278diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in
    1425114279--- ncurses-5.7.orig/misc/gen-pkgconfig.in      1969-12-31 16:00:00.000000000 -0800
    14252 +++ ncurses-5.7/misc/gen-pkgconfig.in   2009-02-15 23:21:17.376018158 -0800
     14280+++ ncurses-5.7/misc/gen-pkgconfig.in   2009-02-22 21:40:14.670322949 -0800
    1425314281@@ -0,0 +1,119 @@
    1425414282+#!@SHELL@
     
    1437314401diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in
    1437414402--- ncurses-5.7.orig/misc/Makefile.in   2007-03-31 08:54:17.000000000 -0700
    14375 +++ ncurses-5.7/misc/Makefile.in        2009-02-15 23:21:19.700165665 -0800
     14403+++ ncurses-5.7/misc/Makefile.in        2009-02-22 21:40:16.170420449 -0800
    1437614404@@ -1,6 +1,6 @@
    1437714405-# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $
     
    1445614484diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in
    1445714485--- ncurses-5.7.orig/misc/ncurses-config.in     2007-03-17 13:02:19.000000000 -0700
    14458 +++ ncurses-5.7/misc/ncurses-config.in  2009-02-15 23:21:17.376018158 -0800
     14486+++ ncurses-5.7/misc/ncurses-config.in  2009-02-22 21:40:14.670322949 -0800
    1445914487@@ -1,7 +1,7 @@
    1446014488 #!@SHELL@
     
    1458314611diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src
    1458414612--- ncurses-5.7.orig/misc/terminfo.src  2008-10-12 16:03:54.000000000 -0700
    14585 +++ ncurses-5.7/misc/terminfo.src       2009-02-15 23:21:14.363823718 -0800
     14613+++ ncurses-5.7/misc/terminfo.src       2009-02-22 21:40:06.821818969 -0800
    1458614614@@ -6,8 +6,8 @@
    1458714615 # Report bugs and new terminal descriptions to
     
    1474914777diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk
    1475014778--- ncurses-5.7.orig/mk-1st.awk 2007-03-24 15:10:55.000000000 -0700
    14751 +++ ncurses-5.7/mk-1st.awk      2009-02-15 23:21:11.279628160 -0800
     14779+++ ncurses-5.7/mk-1st.awk      2009-02-22 21:40:04.169651068 -0800
    1475214780@@ -1,6 +1,6 @@
    1475314781-# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $
     
    1477914807diff -Naur ncurses-5.7.orig/ncurses/base/define_key.c ncurses-5.7/ncurses/base/define_key.c
    1478014808--- ncurses-5.7.orig/ncurses/base/define_key.c  2006-12-30 15:23:31.000000000 -0800
    14781 +++ ncurses-5.7/ncurses/base/define_key.c       2009-02-15 23:21:24.620481072 -0800
     14809+++ ncurses-5.7/ncurses/base/define_key.c       2009-02-22 21:40:17.906529403 -0800
    1478214810@@ -1,5 +1,5 @@
    1478314811 /****************************************************************************
     
    1484814876diff -Naur ncurses-5.7.orig/ncurses/base/keybound.c ncurses-5.7/ncurses/base/keybound.c
    1484914877--- ncurses-5.7.orig/ncurses/base/keybound.c    2006-06-17 11:19:24.000000000 -0700
    14850 +++ ncurses-5.7/ncurses/base/keybound.c 2009-02-15 23:21:24.620481072 -0800
     14878+++ ncurses-5.7/ncurses/base/keybound.c 2009-02-22 21:40:19.478632211 -0800
    1485114879@@ -1,5 +1,5 @@
    1485214880 /****************************************************************************
     
    1486814896 
    1486914897-MODULE_ID("$Id: keybound.c,v 1.7 2006/06/17 18:19:24 tom Exp $")
    14870 +MODULE_ID("$Id: keybound.c,v 1.8 2009/02/15 00:31:10 tom Exp $")
     14898+MODULE_ID("$Id: keybound.c,v 1.9 2009/02/21 16:32:34 tom Exp $")
    1487114899 
    1487214900 /*
     
    1488014908     char *result = 0;
    1488114909 
    14882      T((T_CALLED("keybound(%d,%d)"), code, count));
     14910-    T((T_CALLED("keybound(%d,%d)"), code, count));
    1488314911-    if (SP != 0 && code >= 0) {
    1488414912-       result = _nc_expand_try(SP->_keytry, (unsigned) code, &count, 0);
     14913+    T((T_CALLED("keybound(%p, %d,%d)"), SP_PARM, code, count));
    1488514914+    if (SP_PARM != 0 && code >= 0) {
    1488614915+       result = _nc_expand_try(SP_PARM->_keytry, (unsigned) code, &count, 0);
     
    1489814927diff -Naur ncurses-5.7.orig/ncurses/base/key_defined.c ncurses-5.7/ncurses/base/key_defined.c
    1489914928--- ncurses-5.7.orig/ncurses/base/key_defined.c 2006-12-30 15:22:55.000000000 -0800
    14900 +++ ncurses-5.7/ncurses/base/key_defined.c      2009-02-15 23:21:24.620481072 -0800
     14929+++ ncurses-5.7/ncurses/base/key_defined.c      2009-02-22 21:40:19.478632211 -0800
    1490114930@@ -1,5 +1,5 @@
    1490214931 /****************************************************************************
     
    1490614935  * Permission is hereby granted, free of charge, to any person obtaining a  *
    1490714936  * copy of this software and associated documentation files (the            *
    14908 @@ -27,12 +27,13 @@
    14909   ****************************************************************************/
    14910  
    14911  /****************************************************************************
    14912 - *  Author: Thomas E. Dickey, 2003                                          *
    14913 + *  Author: Thomas E. Dickey                        2003                    *
    14914 + *     and: Juergen Pfeifer                         2009                    *
    14915   ****************************************************************************/
     14937@@ -32,7 +32,7 @@
    1491614938 
    1491714939 #include <curses.priv.h>
    1491814940 
    1491914941-MODULE_ID("$Id: key_defined.c,v 1.6 2006/12/30 23:22:55 tom Exp $")
    14920 +MODULE_ID("$Id: key_defined.c,v 1.7 2009/02/15 00:30:00 tom Exp $")
     14942+MODULE_ID("$Id: key_defined.c,v 1.8 2009/02/21 16:24:26 tom Exp $")
    1492114943 
    1492214944 static int
    1492314945 find_definition(TRIES * tree, const char *str)
    14924 @@ -65,14 +66,22 @@
     14946@@ -65,14 +65,22 @@
    1492514947  * Otherwise, return the keycode's value (neither OK/ERR).
    1492614948  */
     
    1493114953     int code = ERR;
    1493214954 
    14933      T((T_CALLED("key_defined(%s)"), _nc_visbuf(str)));
     14955-    T((T_CALLED("key_defined(%s)"), _nc_visbuf(str)));
    1493414956-    if (SP != 0 && str != 0) {
    1493514957-       code = find_definition(SP->_keytry, str);
     14958+    T((T_CALLED("key_defined(%p, %s)"), SP_PARM, _nc_visbuf(str)));
    1493614959+    if (SP_PARM != 0 && str != 0) {
    1493714960+       code = find_definition(SP_PARM->_keytry, str);
     
    1495014973diff -Naur ncurses-5.7.orig/ncurses/base/keyok.c ncurses-5.7/ncurses/base/keyok.c
    1495114974--- ncurses-5.7.orig/ncurses/base/keyok.c       2006-12-30 08:22:33.000000000 -0800
    14952 +++ ncurses-5.7/ncurses/base/keyok.c    2009-02-15 23:21:24.620481072 -0800
     14975+++ ncurses-5.7/ncurses/base/keyok.c    2009-02-22 21:40:17.906529403 -0800
    1495314976@@ -1,5 +1,5 @@
    1495414977 /****************************************************************************
     
    1502215045diff -Naur ncurses-5.7.orig/ncurses/base/legacy_coding.c ncurses-5.7/ncurses/base/legacy_coding.c
    1502315046--- ncurses-5.7.orig/ncurses/base/legacy_coding.c       2005-12-17 15:38:17.000000000 -0800
    15024 +++ ncurses-5.7/ncurses/base/legacy_coding.c    2009-02-15 23:21:24.620481072 -0800
     15047+++ ncurses-5.7/ncurses/base/legacy_coding.c    2009-02-22 21:40:19.478632211 -0800
    1502515048@@ -1,5 +1,5 @@
    1502615049 /****************************************************************************
     
    1504215065 
    1504315066-MODULE_ID("$Id: legacy_coding.c,v 1.2 2005/12/17 23:38:17 tom Exp $")
    15044 +MODULE_ID("$Id: legacy_coding.c,v 1.3 2009/02/14 21:46:14 tom Exp $")
     15067+MODULE_ID("$Id: legacy_coding.c,v 1.4 2009/02/21 16:16:38 tom Exp $")
    1504515068 
    1504615069 NCURSES_EXPORT(int)
     
    1505015073     int result = ERR;
    1505115074 
    15052      T((T_CALLED("use_legacy_coding(%d)"), level));
     15075-    T((T_CALLED("use_legacy_coding(%d)"), level));
    1505315076-    if (level >= 0 && level <= 2 && SP != 0) {
    1505415077-       result = SP->_legacy_coding;
    1505515078-       SP->_legacy_coding = level;
     15079+    T((T_CALLED("use_legacy_coding(%p,%d)"), SP_PARM, level));
    1505615080+    if (level >= 0 && level <= 2 && SP_PARM != 0) {
    1505715081+       result = SP_PARM->_legacy_coding;
     
    1507015094diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c
    1507115095--- ncurses-5.7.orig/ncurses/base/lib_addch.c   2008-08-16 12:20:04.000000000 -0700
    15072 +++ ncurses-5.7/ncurses/base/lib_addch.c        2009-02-15 23:21:15.875920379 -0800
     15096+++ ncurses-5.7/ncurses/base/lib_addch.c        2009-02-22 21:40:13.074219583 -0800
    1507315097@@ -1,5 +1,5 @@
    1507415098 /****************************************************************************
     
    1512715151diff -Naur ncurses-5.7.orig/ncurses/base/lib_beep.c ncurses-5.7/ncurses/base/lib_beep.c
    1512815152--- ncurses-5.7.orig/ncurses/base/lib_beep.c    2005-04-09 08:20:04.000000000 -0700
    15129 +++ ncurses-5.7/ncurses/base/lib_beep.c 2009-02-15 23:21:24.620481072 -0800
     15153+++ ncurses-5.7/ncurses/base/lib_beep.c 2009-02-22 21:40:17.906529403 -0800
    1513015154@@ -1,5 +1,5 @@
    1513115155 /****************************************************************************
     
    1517515199diff -Naur ncurses-5.7.orig/ncurses/base/lib_color.c ncurses-5.7/ncurses/base/lib_color.c
    1517615200--- ncurses-5.7.orig/ncurses/base/lib_color.c   2007-04-07 10:07:28.000000000 -0700
    15177 +++ ncurses-5.7/ncurses/base/lib_color.c        2009-02-15 23:21:24.620481072 -0800
     15201+++ ncurses-5.7/ncurses/base/lib_color.c        2009-02-22 21:40:17.906529403 -0800
    1517815202@@ -1,5 +1,5 @@
    1517915203 /****************************************************************************
     
    1558815612diff -Naur ncurses-5.7.orig/ncurses/base/lib_colorset.c ncurses-5.7/ncurses/base/lib_colorset.c
    1558915613--- ncurses-5.7.orig/ncurses/base/lib_colorset.c        2005-01-29 13:40:51.000000000 -0800
    15590 +++ ncurses-5.7/ncurses/base/lib_colorset.c     2009-02-15 23:21:17.376018158 -0800
     15614+++ ncurses-5.7/ncurses/base/lib_colorset.c     2009-02-22 21:40:14.670322949 -0800
    1559115615@@ -1,5 +1,5 @@
    1559215616 /****************************************************************************
     
    1563615660diff -Naur ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c ncurses-5.7/ncurses/base/lib_dft_fgbg.c
    1563715661--- ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c        2005-11-26 12:03:38.000000000 -0800
    15638 +++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c     2009-02-15 23:21:24.620481072 -0800
     15662+++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c     2009-02-22 21:40:17.906529403 -0800
    1563915663@@ -1,5 +1,5 @@
    1564015664 /****************************************************************************
     
    1572415748diff -Naur ncurses-5.7.orig/ncurses/base/lib_echo.c ncurses-5.7/ncurses/base/lib_echo.c
    1572515749--- ncurses-5.7.orig/ncurses/base/lib_echo.c    2000-12-09 18:43:27.000000000 -0800
    15726 +++ ncurses-5.7/ncurses/base/lib_echo.c 2009-02-15 23:21:24.620481072 -0800
     15750+++ ncurses-5.7/ncurses/base/lib_echo.c 2009-02-22 21:40:19.478632211 -0800
     15751@@ -1,5 +1,5 @@
     15752 /****************************************************************************
     15753- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     15754+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     15755  *                                                                          *
     15756  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15757  * copy of this software and associated documentation files (the            *
     15758@@ -29,6 +29,8 @@
     15759 /****************************************************************************
     15760  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     15761  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     15762+ *     and: Thomas E. Dickey                        1996-on                 *
     15763+ *     and: Juergen Pfeifer                         2009                    *
     15764  ****************************************************************************/
     15765 
     15766 /*
     15767@@ -42,20 +44,40 @@
     15768 
     15769 #include <curses.priv.h>
     15770 
     15771-MODULE_ID("$Id: lib_echo.c,v 1.5 2000/12/10 02:43:27 tom Exp $")
     15772+MODULE_ID("$Id: lib_echo.c,v 1.7 2009/02/21 20:20:40 tom Exp $")
     15773 
     15774 NCURSES_EXPORT(int)
     15775+NCURSES_SP_NAME(echo) (NCURSES_SP_DCL0)
     15776+{
     15777+    T((T_CALLED("echo(%p)"), SP_PARM));
     15778+    if (0 == SP_PARM)
     15779+       returnCode(ERR);
     15780+    SP_PARM->_echo = TRUE;
     15781+    returnCode(OK);
     15782+}
     15783+
     15784+#if NCURSES_SP_FUNCS
     15785+NCURSES_EXPORT(int)
     15786 echo(void)
     15787 {
     15788-    T((T_CALLED("echo()")));
     15789-    SP->_echo = TRUE;
     15790+    return NCURSES_SP_NAME(echo) (CURRENT_SCREEN);
     15791+}
     15792+#endif
     15793+
     15794+NCURSES_EXPORT(int)
     15795+NCURSES_SP_NAME(noecho) (NCURSES_SP_DCL0)
     15796+{
     15797+    T((T_CALLED("noecho(%p)"), SP_PARM));
     15798+    if (0 == SP_PARM)
     15799+       returnCode(ERR);
     15800+    SP_PARM->_echo = FALSE;
     15801     returnCode(OK);
     15802 }
     15803 
     15804+#if NCURSES_SP_FUNCS
     15805 NCURSES_EXPORT(int)
     15806 noecho(void)
     15807 {
     15808-    T((T_CALLED("noecho()")));
     15809-    SP->_echo = FALSE;
     15810-    returnCode(OK);
     15811+    return NCURSES_SP_NAME(noecho) (CURRENT_SCREEN);
     15812 }
     15813+#endif
     15814diff -Naur ncurses-5.7.orig/ncurses/base/lib_endwin.c ncurses-5.7/ncurses/base/lib_endwin.c
     15815--- ncurses-5.7.orig/ncurses/base/lib_endwin.c  2000-12-09 18:43:27.000000000 -0800
     15816+++ ncurses-5.7/ncurses/base/lib_endwin.c       2009-02-22 21:40:17.910529962 -0800
    1572715817@@ -1,5 +1,5 @@
    1572815818 /****************************************************************************
     
    1574115831 
    1574215832 /*
    15743 @@ -42,20 +44,36 @@
    15744  
     15833@@ -41,16 +43,16 @@
    1574515834 #include <curses.priv.h>
    15746  
    15747 -MODULE_ID("$Id: lib_echo.c,v 1.5 2000/12/10 02:43:27 tom Exp $")
    15748 +MODULE_ID("$Id: lib_echo.c,v 1.6 2009/02/15 00:34:19 tom Exp $")
     15835 #include <term.h>
     15836 
     15837-MODULE_ID("$Id: lib_endwin.c,v 1.19 2000/12/10 02:43:27 tom Exp $")
     15838+MODULE_ID("$Id: lib_endwin.c,v 1.20 2009/02/15 00:35:00 tom Exp $")
    1574915839 
    1575015840 NCURSES_EXPORT(int)
    15751 -echo(void)
    15752 +NCURSES_SP_NAME(echo) (NCURSES_SP_DCL0)
     15841-endwin(void)
     15842+NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0)
    1575315843 {
    15754      T((T_CALLED("echo()")));
    15755 -    SP->_echo = TRUE;
    15756 +    SP_PARM->_echo = TRUE;
    15757      returnCode(OK);
    15758  }
    15759  
     15844     T((T_CALLED("endwin()")));
     15845 
     15846-    if (SP) {
     15847-       SP->_endwin = TRUE;
     15848-       SP->_mouse_wrap(SP);
     15849+    if (SP_PARM) {
     15850+       SP_PARM->_endwin = TRUE;
     15851+       SP_PARM->_mouse_wrap(SP_PARM);
     15852        _nc_screen_wrap();
     15853        _nc_mvcur_wrap();       /* wrap up cursor addressing */
     15854        returnCode(reset_shell_mode());
     15855@@ -58,3 +60,11 @@
     15856 
     15857     returnCode(ERR);
     15858 }
     15859+
    1576015860+#if NCURSES_SP_FUNCS
    15761  NCURSES_EXPORT(int)
    15762 -noecho(void)
    15763 +echo(void)
     15861+NCURSES_EXPORT(int)
     15862+endwin(void)
    1576415863+{
    15765 +    return NCURSES_SP_NAME(echo) (CURRENT_SCREEN);
     15864+    return NCURSES_SP_NAME(endwin) (CURRENT_SCREEN);
    1576615865+}
    1576715866+#endif
    15768 +
    15769 +NCURSES_EXPORT(int)
    15770 +NCURSES_SP_NAME(noecho) (NCURSES_SP_DCL0)
    15771  {
    15772      T((T_CALLED("noecho()")));
    15773 -    SP->_echo = FALSE;
    15774 +    SP_PARM->_echo = FALSE;
    15775      returnCode(OK);
    15776  }
    15777 +
    15778 +#if NCURSES_SP_FUNCS
    15779 +NCURSES_EXPORT(int)
    15780 +noecho(void)
    15781 +{
    15782 +    return NCURSES_SP_NAME(noecho) (CURRENT_SCREEN);
    15783 +}
    15784 +#endif
    15785 diff -Naur ncurses-5.7.orig/ncurses/base/lib_endwin.c ncurses-5.7/ncurses/base/lib_endwin.c
    15786 --- ncurses-5.7.orig/ncurses/base/lib_endwin.c  2000-12-09 18:43:27.000000000 -0800
    15787 +++ ncurses-5.7/ncurses/base/lib_endwin.c       2009-02-15 23:21:24.620481072 -0800
     15867diff -Naur ncurses-5.7.orig/ncurses/base/lib_flash.c ncurses-5.7/ncurses/base/lib_flash.c
     15868--- ncurses-5.7.orig/ncurses/base/lib_flash.c   2000-12-09 18:43:27.000000000 -0800
     15869+++ ncurses-5.7/ncurses/base/lib_flash.c        2009-02-22 21:40:17.910529962 -0800
    1578815870@@ -1,5 +1,5 @@
    1578915871 /****************************************************************************
     
    1580215884 
    1580315885 /*
    15804 @@ -41,16 +43,16 @@
    15805  #include <curses.priv.h>
    15806  #include <term.h>
    15807  
    15808 -MODULE_ID("$Id: lib_endwin.c,v 1.19 2000/12/10 02:43:27 tom Exp $")
    15809 +MODULE_ID("$Id: lib_endwin.c,v 1.20 2009/02/15 00:35:00 tom Exp $")
    15810  
    15811  NCURSES_EXPORT(int)
    15812 -endwin(void)
    15813 +NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0)
    15814  {
    15815      T((T_CALLED("endwin()")));
    15816  
    15817 -    if (SP) {
    15818 -       SP->_endwin = TRUE;
    15819 -       SP->_mouse_wrap(SP);
    15820 +    if (SP_PARM) {
    15821 +       SP_PARM->_endwin = TRUE;
    15822 +       SP_PARM->_mouse_wrap(SP_PARM);
    15823         _nc_screen_wrap();
    15824         _nc_mvcur_wrap();       /* wrap up cursor addressing */
    15825         returnCode(reset_shell_mode());
    15826 @@ -58,3 +60,11 @@
    15827  
    15828      returnCode(ERR);
    15829  }
    15830 +
    15831 +#if NCURSES_SP_FUNCS
    15832 +NCURSES_EXPORT(int)
    15833 +endwin(void)
    15834 +{
    15835 +    return NCURSES_SP_NAME(endwin) (CURRENT_SCREEN);
    15836 +}
    15837 +#endif
    15838 diff -Naur ncurses-5.7.orig/ncurses/base/lib_flash.c ncurses-5.7/ncurses/base/lib_flash.c
    15839 --- ncurses-5.7.orig/ncurses/base/lib_flash.c   2000-12-09 18:43:27.000000000 -0800
    15840 +++ ncurses-5.7/ncurses/base/lib_flash.c        2009-02-15 23:21:24.624480793 -0800
    15841 @@ -1,5 +1,5 @@
    15842  /****************************************************************************
    15843 - * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
    15844 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
    15845   *                                                                          *
    15846   * Permission is hereby granted, free of charge, to any person obtaining a  *
    15847   * copy of this software and associated documentation files (the            *
    15848 @@ -29,6 +29,8 @@
    15849  /****************************************************************************
    15850   *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
    15851   *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
    15852 + *     and: Thomas E. Dickey                        1996-on                 *
    15853 + *     and: Juergen Pfeifer                         2009                    *
    15854   ****************************************************************************/
    15855  
    15856  /*
    1585715886@@ -41,7 +43,7 @@
    1585815887 #include <curses.priv.h>
     
    1588715916diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c
    1588815917--- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700
    15889 +++ ncurses-5.7/ncurses/base/lib_freeall.c      2009-02-15 23:21:03.083101270 -0800
     15918+++ ncurses-5.7/ncurses/base/lib_freeall.c      2009-02-22 21:39:55.861116636 -0800
    1589015919@@ -40,7 +40,7 @@
    1589115920 extern int malloc_errfd;       /* FIXME */
     
    1590815937diff -Naur ncurses-5.7.orig/ncurses/base/lib_getch.c ncurses-5.7/ncurses/base/lib_getch.c
    1590915938--- ncurses-5.7.orig/ncurses/base/lib_getch.c   2008-09-20 12:46:13.000000000 -0700
    15910 +++ ncurses-5.7/ncurses/base/lib_getch.c        2009-02-15 23:21:24.624480793 -0800
     15939+++ ncurses-5.7/ncurses/base/lib_getch.c        2009-02-22 21:40:17.910529962 -0800
    1591115940@@ -1,5 +1,5 @@
    1591215941 /****************************************************************************
     
    1597716006diff -Naur ncurses-5.7.orig/ncurses/base/lib_isendwin.c ncurses-5.7/ncurses/base/lib_isendwin.c
    1597816007--- ncurses-5.7.orig/ncurses/base/lib_isendwin.c        2000-12-09 18:43:27.000000000 -0800
    15979 +++ ncurses-5.7/ncurses/base/lib_isendwin.c     2009-02-15 23:21:24.624480793 -0800
     16008+++ ncurses-5.7/ncurses/base/lib_isendwin.c     2009-02-22 21:40:17.910529962 -0800
    1598016009@@ -1,5 +1,5 @@
    1598116010 /****************************************************************************
     
    1602116050diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c
    1602216051--- ncurses-5.7.orig/ncurses/base/lib_mouse.c   2008-10-18 14:48:55.000000000 -0700
    16023 +++ ncurses-5.7/ncurses/base/lib_mouse.c        2009-02-15 23:21:03.083101270 -0800
     16052+++ ncurses-5.7/ncurses/base/lib_mouse.c        2009-02-22 21:39:55.861116636 -0800
    1602416053@@ -79,7 +79,7 @@
    1602516054 
     
    1608016109diff -Naur ncurses-5.7.orig/ncurses/base/lib_newterm.c ncurses-5.7/ncurses/base/lib_newterm.c
    1608116110--- ncurses-5.7.orig/ncurses/base/lib_newterm.c 2008-08-16 14:20:48.000000000 -0700
    16082 +++ ncurses-5.7/ncurses/base/lib_newterm.c      2009-02-15 23:21:24.624480793 -0800
     16111+++ ncurses-5.7/ncurses/base/lib_newterm.c      2009-02-22 21:40:17.910529962 -0800
    1608316112@@ -1,5 +1,5 @@
    1608416113 /****************************************************************************
     
    1619116220diff -Naur ncurses-5.7.orig/ncurses/base/lib_newwin.c ncurses-5.7/ncurses/base/lib_newwin.c
    1619216221--- ncurses-5.7.orig/ncurses/base/lib_newwin.c  2008-06-07 06:58:09.000000000 -0700
    16193 +++ ncurses-5.7/ncurses/base/lib_newwin.c       2009-02-15 23:21:24.624480793 -0800
     16222+++ ncurses-5.7/ncurses/base/lib_newwin.c       2009-02-22 21:40:17.910529962 -0800
    1619416223@@ -1,5 +1,5 @@
    1619516224 /****************************************************************************
     
    1625316282diff -Naur ncurses-5.7.orig/ncurses/base/lib_nl.c ncurses-5.7/ncurses/base/lib_nl.c
    1625416283--- ncurses-5.7.orig/ncurses/base/lib_nl.c      2000-12-09 18:43:27.000000000 -0800
    16255 +++ ncurses-5.7/ncurses/base/lib_nl.c   2009-02-15 23:21:24.624480793 -0800
     16284+++ ncurses-5.7/ncurses/base/lib_nl.c   2009-02-22 21:40:19.478632211 -0800
    1625616285@@ -1,5 +1,5 @@
    1625716286 /****************************************************************************
    1625816287- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
    16259 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     16288+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
    1626016289  *                                                                          *
    1626116290  * Permission is hereby granted, free of charge, to any person obtaining a  *
     
    1627016299 
    1627116300 /*
    16272 @@ -42,18 +44,18 @@
     16301@@ -42,38 +44,52 @@
    1627316302 
    1627416303 #include <curses.priv.h>
    1627516304 
    1627616305-MODULE_ID("$Id: lib_nl.c,v 1.8 2000/12/10 02:43:27 tom Exp $")
    16277 +MODULE_ID("$Id: lib_nl.c,v 1.9 2009/02/15 00:38:22 tom Exp $")
     16306+MODULE_ID("$Id: lib_nl.c,v 1.10 2009/02/21 20:58:21 tom Exp $")
    1627816307 
    1627916308 #ifdef __EMX__
     
    1628516314+NCURSES_SP_NAME(nl) (NCURSES_SP_DCL0)
    1628616315 {
    16287      T((T_CALLED("nl()")));
    16288  
     16316-    T((T_CALLED("nl()")));
     16317-
    1628916318-    SP->_nl = TRUE;
     16319-
     16320+    T((T_CALLED("nl(%p)"), SP_PARM));
     16321+    if (0 == SP_PARM)
     16322+       returnCode(ERR);
    1629016323+    SP_PARM->_nl = TRUE;
    16291  
    1629216324 #ifdef __EMX__
    1629316325     _nc_flush();
    16294 @@ -63,12 +65,20 @@
     16326     _fsetmode(NC_OUTPUT, "t");
     16327 #endif
     16328-
    1629516329     returnCode(OK);
    1629616330 }
     
    1630016334-nonl(void)
    1630116335+nl(void)
    16302 +{
     16336 {
     16337-    T((T_CALLED("nonl()")));
     16338-
     16339-    SP->_nl = FALSE;
    1630316340+    return NCURSES_SP_NAME(nl) (CURRENT_SCREEN);
    1630416341+}
    1630516342+#endif
    16306 +
     16343 
    1630716344+NCURSES_EXPORT(int)
    1630816345+NCURSES_SP_NAME(nonl) (NCURSES_SP_DCL0)
    16309  {
    16310      T((T_CALLED("nonl()")));
    16311  
    16312 -    SP->_nl = FALSE;
     16346+{
     16347+    T((T_CALLED("nonl(%p)"), SP_PARM));
     16348+    if (0 == SP_PARM)
     16349+       returnCode(ERR);
    1631316350+    SP_PARM->_nl = FALSE;
    16314  
    1631516351 #ifdef __EMX__
    1631616352     _nc_flush();
    16317 @@ -77,3 +87,11 @@
    16318  
     16353     _fsetmode(NC_OUTPUT, "b");
     16354 #endif
     16355-
    1631916356     returnCode(OK);
    1632016357 }
     
    1632916366diff -Naur ncurses-5.7.orig/ncurses/base/lib_pad.c ncurses-5.7/ncurses/base/lib_pad.c
    1633016367--- ncurses-5.7.orig/ncurses/base/lib_pad.c     2006-10-14 13:47:13.000000000 -0700
    16331 +++ ncurses-5.7/ncurses/base/lib_pad.c  2009-02-15 23:21:24.624480793 -0800
     16368+++ ncurses-5.7/ncurses/base/lib_pad.c  2009-02-22 21:40:17.910529962 -0800
    1633216369@@ -1,5 +1,5 @@
    1633316370 /****************************************************************************
     
    1637616413diff -Naur ncurses-5.7.orig/ncurses/base/lib_screen.c ncurses-5.7/ncurses/base/lib_screen.c
    1637716414--- ncurses-5.7.orig/ncurses/base/lib_screen.c  2008-08-16 12:05:37.000000000 -0700
    16378 +++ ncurses-5.7/ncurses/base/lib_screen.c       2009-02-15 23:21:24.624480793 -0800
     16415+++ ncurses-5.7/ncurses/base/lib_screen.c       2009-02-22 21:40:17.910529962 -0800
    1637916416@@ -1,5 +1,5 @@
    1638016417 /****************************************************************************
     
    1649416531diff -Naur ncurses-5.7.orig/ncurses/base/lib_set_term.c ncurses-5.7/ncurses/base/lib_set_term.c
    1649516532--- ncurses-5.7.orig/ncurses/base/lib_set_term.c        2008-08-04 11:11:12.000000000 -0700
    16496 +++ ncurses-5.7/ncurses/base/lib_set_term.c     2009-02-15 23:21:24.624480793 -0800
     16533+++ ncurses-5.7/ncurses/base/lib_set_term.c     2009-02-22 21:40:17.910529962 -0800
    1649716534@@ -1,5 +1,5 @@
    1649816535 /****************************************************************************
     
    1654416581diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrof.c ncurses-5.7/ncurses/base/lib_slkatrof.c
    1654516582--- ncurses-5.7.orig/ncurses/base/lib_slkatrof.c        2005-01-08 15:01:32.000000000 -0800
    16546 +++ ncurses-5.7/ncurses/base/lib_slkatrof.c     2009-02-15 23:21:24.624480793 -0800
     16583+++ ncurses-5.7/ncurses/base/lib_slkatrof.c     2009-02-22 21:40:19.478632211 -0800
    1654716584@@ -1,5 +1,5 @@
    1654816585 /****************************************************************************
     
    1655716594 
    1655816595-MODULE_ID("$Id: lib_slkatrof.c,v 1.8 2005/01/08 23:01:32 tom Exp $")
    16559 +MODULE_ID("$Id: lib_slkatrof.c,v 1.9 2009/02/15 00:33:48 tom Exp $")
     16596+MODULE_ID("$Id: lib_slkatrof.c,v 1.10 2009/02/21 17:35:28 tom Exp $")
    1656016597 
    1656116598 NCURSES_EXPORT(int)
     
    1656316600+NCURSES_SP_NAME(slk_attroff) (NCURSES_SP_DCLx const chtype attr)
    1656416601 {
    16565      T((T_CALLED("slk_attroff(%s)"), _traceattr(attr)));
     16602-    T((T_CALLED("slk_attroff(%s)"), _traceattr(attr)));
     16603+    T((T_CALLED("slk_attroff(%p,%s)"), SP_PARM, _traceattr(attr)));
    1656616604 
    1656716605-    if (SP != 0 && SP->_slk != 0) {
     
    1659116629diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatron.c ncurses-5.7/ncurses/base/lib_slkatron.c
    1659216630--- ncurses-5.7.orig/ncurses/base/lib_slkatron.c        2005-01-08 15:02:01.000000000 -0800
    16593 +++ ncurses-5.7/ncurses/base/lib_slkatron.c     2009-02-15 23:21:24.624480793 -0800
     16631+++ ncurses-5.7/ncurses/base/lib_slkatron.c     2009-02-22 21:40:19.478632211 -0800
    1659416632@@ -1,5 +1,5 @@
    1659516633 /****************************************************************************
     
    1660416642 
    1660516643-MODULE_ID("$Id: lib_slkatron.c,v 1.8 2005/01/08 23:02:01 tom Exp $")
    16606 +MODULE_ID("$Id: lib_slkatron.c,v 1.9 2009/02/15 00:33:48 tom Exp $")
     16644+MODULE_ID("$Id: lib_slkatron.c,v 1.10 2009/02/21 18:16:04 tom Exp $")
    1660716645 
    1660816646 NCURSES_EXPORT(int)
     
    1661016648+NCURSES_SP_NAME(slk_attron) (NCURSES_SP_DCLx const chtype attr)
    1661116649 {
    16612      T((T_CALLED("slk_attron(%s)"), _traceattr(attr)));
     16650-    T((T_CALLED("slk_attron(%s)"), _traceattr(attr)));
     16651+    T((T_CALLED("slk_attron(%p,%s)"), SP_PARM, _traceattr(attr)));
    1661316652 
    1661416653-    if (SP != 0 && SP->_slk != 0) {
     
    1663816677diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c ncurses-5.7/ncurses/base/lib_slkatr_set.c
    1663916678--- ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c      2005-01-28 13:11:53.000000000 -0800
    16640 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c   2009-02-15 23:21:24.624480793 -0800
     16679+++ ncurses-5.7/ncurses/base/lib_slkatr_set.c   2009-02-22 21:40:19.478632211 -0800
    1664116680@@ -1,5 +1,5 @@
    1664216681 /****************************************************************************
     
    1666016699 
    1666116700-MODULE_ID("$Id: lib_slkatr_set.c,v 1.10 2005/01/28 21:11:53 tom Exp $")
    16662 +MODULE_ID("$Id: lib_slkatr_set.c,v 1.12 2009/02/15 00:33:48 tom Exp $")
     16701+MODULE_ID("$Id: lib_slkatr_set.c,v 1.13 2009/02/21 17:20:17 tom Exp $")
    1666316702 
    1666416703 NCURSES_EXPORT(int)
     
    1666916708+                              void *opts)
    1667016709 {
     16710-    T((T_CALLED("slk_attr_set(%s,%d)"), _traceattr(attr), color_pair_number));
    1667116711+    int code = ERR;
    1667216712+
    16673      T((T_CALLED("slk_attr_set(%s,%d)"), _traceattr(attr), color_pair_number));
     16713+    T((T_CALLED("slk_attr_set(%p,%s,%d)"), SP_PARM, _traceattr(attr), color_pair_number));
    1667416714 
    1667516715-    if (SP != 0 && SP->_slk != 0 && !opts &&
     
    1670816748diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrset.c ncurses-5.7/ncurses/base/lib_slkatrset.c
    1670916749--- ncurses-5.7.orig/ncurses/base/lib_slkatrset.c       2005-01-08 13:46:47.000000000 -0800
    16710 +++ ncurses-5.7/ncurses/base/lib_slkatrset.c    2009-02-15 23:21:24.628481072 -0800
     16750+++ ncurses-5.7/ncurses/base/lib_slkatrset.c    2009-02-22 21:40:19.478632211 -0800
    1671116751@@ -1,5 +1,5 @@
    1671216752 /****************************************************************************
     
    1672116761 
    1672216762-MODULE_ID("$Id: lib_slkatrset.c,v 1.7 2005/01/08 21:46:47 tom Exp $")
    16723 +MODULE_ID("$Id: lib_slkatrset.c,v 1.8 2009/02/15 00:33:48 tom Exp $")
     16763+MODULE_ID("$Id: lib_slkatrset.c,v 1.9 2009/02/21 17:49:07 tom Exp $")
    1672416764 
    1672516765 NCURSES_EXPORT(int)
     
    1672716767+NCURSES_SP_NAME(slk_attrset) (NCURSES_SP_DCLx const chtype attr)
    1672816768 {
    16729      T((T_CALLED("slk_attrset(%s)"), _traceattr(attr)));
     16769-    T((T_CALLED("slk_attrset(%s)"), _traceattr(attr)));
     16770+    T((T_CALLED("slk_attrset(%p,%s)"), SP_PARM, _traceattr(attr)));
    1673016771 
    1673116772-    if (SP != 0 && SP->_slk != 0) {
     
    1674716788diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkattr.c ncurses-5.7/ncurses/base/lib_slkattr.c
    1674816789--- ncurses-5.7.orig/ncurses/base/lib_slkattr.c 2005-01-08 13:44:28.000000000 -0800
    16749 +++ ncurses-5.7/ncurses/base/lib_slkattr.c      2009-02-15 23:21:24.628481072 -0800
     16790+++ ncurses-5.7/ncurses/base/lib_slkattr.c      2009-02-22 21:40:19.478632211 -0800
    1675016791@@ -1,5 +1,5 @@
    1675116792 /****************************************************************************
     
    1676016801 
    1676116802-MODULE_ID("$Id: lib_slkattr.c,v 1.6 2005/01/08 21:44:28 tom Exp $")
    16762 +MODULE_ID("$Id: lib_slkattr.c,v 1.7 2009/02/15 00:33:48 tom Exp $")
     16803+MODULE_ID("$Id: lib_slkattr.c,v 1.8 2009/02/21 17:48:14 tom Exp $")
    1676316804 
    1676416805 NCURSES_EXPORT(attr_t)
     
    1676616807+NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0)
    1676716808 {
    16768      T((T_CALLED("slk_attr()")));
     16809-    T((T_CALLED("slk_attr()")));
     16810+    T((T_CALLED("slk_attr(%p)"), SP_PARM));
    1676916811 
    1677016812-    if (SP != 0 && SP->_slk != 0) {
     
    1679016832diff -Naur ncurses-5.7.orig/ncurses/base/lib_slk.c ncurses-5.7/ncurses/base/lib_slk.c
    1679116833--- ncurses-5.7.orig/ncurses/base/lib_slk.c     2008-09-27 07:07:33.000000000 -0700
    16792 +++ ncurses-5.7/ncurses/base/lib_slk.c  2009-02-15 23:21:24.624480793 -0800
     16834+++ ncurses-5.7/ncurses/base/lib_slk.c  2009-02-22 21:40:17.910529962 -0800
    1679316835@@ -1,5 +1,5 @@
    1679416836 /****************************************************************************
     
    1683616878diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkclear.c ncurses-5.7/ncurses/base/lib_slkclear.c
    1683716879--- ncurses-5.7.orig/ncurses/base/lib_slkclear.c        2007-12-29 09:51:47.000000000 -0800
    16838 +++ ncurses-5.7/ncurses/base/lib_slkclear.c     2009-02-15 23:21:24.628481072 -0800
     16880+++ ncurses-5.7/ncurses/base/lib_slkclear.c     2009-02-22 21:40:19.478632211 -0800
    1683916881@@ -1,5 +1,5 @@
    1684016882 /****************************************************************************
     
    1684916891 
    1685016892-MODULE_ID("$Id: lib_slkclear.c,v 1.10 2007/12/29 17:51:47 tom Exp $")
    16851 +MODULE_ID("$Id: lib_slkclear.c,v 1.11 2009/02/15 00:33:48 tom Exp $")
     16893+MODULE_ID("$Id: lib_slkclear.c,v 1.12 2009/02/21 17:47:14 tom Exp $")
    1685216894 
    1685316895 NCURSES_EXPORT(int)
     
    1685716899     int rc = ERR;
    1685816900 
    16859      T((T_CALLED("slk_clear()")));
     16901-    T((T_CALLED("slk_clear()")));
     16902+    T((T_CALLED("slk_clear(%p)"), SP_PARM));
    1686016903 
    1686116904-    if (SP != NULL && SP->_slk != NULL) {
    1686216905-       SP->_slk->hidden = TRUE;
    16863 +    if (SP_PARM != NULL && SP_PARM->_slk != NULL) {
     16906+    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
    1686416907+       SP_PARM->_slk->hidden = TRUE;
    1686516908        /* For simulated SLK's it looks much more natural to
     
    1686816911-       WINDOW_ATTRS(SP->_slk->win) = WINDOW_ATTRS(stdscr);
    1686916912-       if (SP->_slk->win == stdscr) {
    16870 +       SP_PARM->_slk->win->_nc_bkgd = stdscr->_nc_bkgd;
    16871 +       WINDOW_ATTRS(SP_PARM->_slk->win) = WINDOW_ATTRS(stdscr);
    16872 +       if (SP_PARM->_slk->win == stdscr) {
     16913+       SP_PARM->_slk->win->_nc_bkgd = SP_PARM->_stdscr->_nc_bkgd;
     16914+       WINDOW_ATTRS(SP_PARM->_slk->win) = WINDOW_ATTRS(SP_PARM->_stdscr);
     16915+       if (SP_PARM->_slk->win == SP_PARM->_stdscr) {
    1687316916            rc = OK;
    1687416917        } else {
     
    1689116934diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkcolor.c ncurses-5.7/ncurses/base/lib_slkcolor.c
    1689216935--- ncurses-5.7.orig/ncurses/base/lib_slkcolor.c        2005-01-28 13:11:53.000000000 -0800
    16893 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c     2009-02-15 23:21:24.628481072 -0800
     16936+++ ncurses-5.7/ncurses/base/lib_slkcolor.c     2009-02-22 21:40:19.478632211 -0800
    1689416937@@ -1,5 +1,5 @@
    1689516938 /****************************************************************************
     
    1689916942  * Permission is hereby granted, free of charge, to any person obtaining a  *
    1690016943  * copy of this software and associated documentation files (the            *
    16901 @@ -28,7 +28,7 @@
     16944@@ -27,8 +27,8 @@
     16945  ****************************************************************************/
    1690216946 
    1690316947 /****************************************************************************
    16904   *  Author:  Juergen Pfeifer, 1998                                          *
     16948- *  Author:  Juergen Pfeifer, 1998                                          *
    1690516949- *     and:  Thomas E. Dickey 2005                                          *
     16950+ *  Author:  Juergen Pfeifer, 1998,2009                                     *
    1690616951+ *     and:  Thomas E. Dickey 2005-on                                       *
    1690716952  ****************************************************************************/
     
    1691316958 
    1691416959-MODULE_ID("$Id: lib_slkcolor.c,v 1.12 2005/01/28 21:11:53 tom Exp $")
    16915 +MODULE_ID("$Id: lib_slkcolor.c,v 1.14 2009/02/15 00:33:48 tom Exp $")
     16960+MODULE_ID("$Id: lib_slkcolor.c,v 1.15 2009/02/21 16:59:50 tom Exp $")
    1691616961 
    1691716962 NCURSES_EXPORT(int)
     
    1691916964+NCURSES_SP_NAME(slk_color) (NCURSES_SP_DCLx short color_pair_number)
    1692016965 {
     16966-    T((T_CALLED("slk_color(%d)"), color_pair_number));
    1692116967+    int code = ERR;
    1692216968+
    16923      T((T_CALLED("slk_color(%d)"), color_pair_number));
    16924  
    16925 -    if (SP != 0 && SP->_slk != 0 &&
    16926 -       color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) {
    16927 -       TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr))));
    16928 -       SetPair(SP->_slk->attr, color_pair_number);
    16929 -       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
    16930 -       returnCode(OK);
    16931 -    } else
    16932 -       returnCode(ERR);
     16969+    T((T_CALLED("slk_color(%p,%d)"), SP_PARM, color_pair_number));
     16970+
    1693316971+    if (SP_PARM != 0
    1693416972+       && SP_PARM->_slk != 0
     
    1694216980+    returnCode(code);
    1694316981+}
    16944 +
     16982 
     16983-    if (SP != 0 && SP->_slk != 0 &&
     16984-       color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) {
     16985-       TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr))));
     16986-       SetPair(SP->_slk->attr, color_pair_number);
     16987-       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
     16988-       returnCode(OK);
     16989-    } else
     16990-       returnCode(ERR);
    1694516991+#if NCURSES_SP_FUNCS
    1694616992+NCURSES_EXPORT(int)
     
    1695216998diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkinit.c ncurses-5.7/ncurses/base/lib_slkinit.c
    1695316999--- ncurses-5.7.orig/ncurses/base/lib_slkinit.c 2008-01-12 12:23:39.000000000 -0800
    16954 +++ ncurses-5.7/ncurses/base/lib_slkinit.c      2009-02-15 23:21:24.628481072 -0800
     17000+++ ncurses-5.7/ncurses/base/lib_slkinit.c      2009-02-22 21:40:17.914529962 -0800
    1695517001@@ -1,5 +1,5 @@
    1695617002 /****************************************************************************
     
    1699517041diff -Naur ncurses-5.7.orig/ncurses/base/lib_slklab.c ncurses-5.7/ncurses/base/lib_slklab.c
    1699617042--- ncurses-5.7.orig/ncurses/base/lib_slklab.c  2003-03-29 14:53:48.000000000 -0800
    16997 +++ ncurses-5.7/ncurses/base/lib_slklab.c       2009-02-15 23:21:24.628481072 -0800
     17043+++ ncurses-5.7/ncurses/base/lib_slklab.c       2009-02-22 21:40:19.478632211 -0800
    1699817044@@ -1,5 +1,5 @@
    1699917045 /****************************************************************************
     
    1700717053  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
    1700817054  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
    17009 + *     and: Thomas E. Dickey                        1996-on                 *
    17010 + *     and: Juergen Pfeifer                         2009                    *
     17055+ *     and:  Juergen Pfeifer,                       1998,2009               *
     17056+ *     and:  Thomas E. Dickey                       1998-on                 *
    1701117057  ****************************************************************************/
    1701217058 
     
    1701717063 
    1701817064-MODULE_ID("$Id: lib_slklab.c,v 1.7 2003/03/29 22:53:48 tom Exp $")
    17019 +MODULE_ID("$Id: lib_slklab.c,v 1.8 2009/02/15 00:42:53 tom Exp $")
     17065+MODULE_ID("$Id: lib_slklab.c,v 1.9 2009/02/21 18:48:42 tom Exp $")
    1702017066 
    1702117067 NCURSES_EXPORT(char *)
     
    1702317069+NCURSES_SP_NAME(slk_label) (NCURSES_SP_DCLx int n)
    1702417070 {
    17025      T((T_CALLED("slk_label(%d)"), n));
     17071-    T((T_CALLED("slk_label(%d)"), n));
     17072+    T((T_CALLED("slk_label(%p,%d)"), SP_PARM, n));
    1702617073 
    1702717074-    if (SP == NULL || SP->_slk == NULL || n < 1 || n > SP->_slk->labcnt)
    17028 +    if (SP_PARM == NULL || SP_PARM->_slk == NULL || n < 1 || n > SP_PARM->_slk->labcnt)
     17075+    if (SP_PARM == 0 || SP_PARM->_slk == 0 || n < 1 || n > SP_PARM->_slk->labcnt)
    1702917076        returnPtr(0);
    1703017077-    returnPtr(SP->_slk->ent[n - 1].ent_text);
     
    1704117088diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkrefr.c ncurses-5.7/ncurses/base/lib_slkrefr.c
    1704217089--- ncurses-5.7.orig/ncurses/base/lib_slkrefr.c 2008-09-27 07:07:53.000000000 -0700
    17043 +++ ncurses-5.7/ncurses/base/lib_slkrefr.c      2009-02-15 23:21:24.628481072 -0800
     17090+++ ncurses-5.7/ncurses/base/lib_slkrefr.c      2009-02-22 21:40:17.914529962 -0800
    1704417091@@ -1,5 +1,5 @@
    1704517092 /****************************************************************************
     
    1711917166diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkset.c ncurses-5.7/ncurses/base/lib_slkset.c
    1712017167--- ncurses-5.7.orig/ncurses/base/lib_slkset.c  2007-10-13 13:08:46.000000000 -0700
    17121 +++ ncurses-5.7/ncurses/base/lib_slkset.c       2009-02-15 23:21:24.628481072 -0800
     17168+++ ncurses-5.7/ncurses/base/lib_slkset.c       2009-02-22 21:40:19.478632211 -0800
    1712217169@@ -1,5 +1,5 @@
    1712317170 /****************************************************************************
     
    1713217179 
    1713317180-MODULE_ID("$Id: lib_slkset.c,v 1.17 2007/10/13 20:08:46 tom Exp $")
    17134 +MODULE_ID("$Id: lib_slkset.c,v 1.18 2009/02/15 00:33:48 tom Exp $")
     17181+MODULE_ID("$Id: lib_slkset.c,v 1.19 2009/02/21 17:34:06 tom Exp $")
    1713517182 
    1713617183 NCURSES_EXPORT(int)
     
    1714017187     SLK *slk;
    1714117188     int offset;
    17142 @@ -59,8 +59,8 @@
    17143  
    17144      T((T_CALLED("slk_set(%d, \"%s\", %d)"), i, str, format));
     17189@@ -57,20 +57,20 @@
     17190     const char *str = astr;
     17191     const char *p;
     17192 
     17193-    T((T_CALLED("slk_set(%d, \"%s\", %d)"), i, str, format));
     17194+    T((T_CALLED("slk_set(%p, %d, \"%s\", %d)"), SP_PARM, i, str, format));
    1714517195 
    1714617196-    if (SP == 0
     
    1715117201        || i > slk->labcnt
    1715217202        || format < 0
    17153 @@ -70,7 +70,7 @@
     17203        || format > 2)
     17204        returnCode(ERR);
     17205-    if (str == NULL)
     17206+    if (str == 0)
    1715417207        str = "";
    1715517208     --i;                       /* Adjust numbering of labels */
     
    1717417227diff -Naur ncurses-5.7.orig/ncurses/base/lib_slktouch.c ncurses-5.7/ncurses/base/lib_slktouch.c
    1717517228--- ncurses-5.7.orig/ncurses/base/lib_slktouch.c        2000-12-09 18:43:27.000000000 -0800
    17176 +++ ncurses-5.7/ncurses/base/lib_slktouch.c     2009-02-15 23:21:24.628481072 -0800
     17229+++ ncurses-5.7/ncurses/base/lib_slktouch.c     2009-02-22 21:40:19.478632211 -0800
    1717717230@@ -1,5 +1,5 @@
    1717817231 /****************************************************************************
     
    1719817251 
    1719917252-MODULE_ID("$Id: lib_slktouch.c,v 1.5 2000/12/10 02:43:27 tom Exp $")
    17200 +MODULE_ID("$Id: lib_slktouch.c,v 1.6 2009/02/15 00:44:36 tom Exp $")
     17253+MODULE_ID("$Id: lib_slktouch.c,v 1.7 2009/02/21 17:42:59 tom Exp $")
    1720117254 
    1720217255 NCURSES_EXPORT(int)
     
    1720417257+NCURSES_SP_NAME(slk_touch) (NCURSES_SP_DCL0)
    1720517258 {
    17206      T((T_CALLED("slk_touch()")));
     17259-    T((T_CALLED("slk_touch()")));
     17260+    T((T_CALLED("slk_touch(%p)"), SP_PARM));
    1720717261 
    1720817262-    if (SP == NULL || SP->_slk == NULL)
    17209 +    if (SP_PARM == NULL || SP_PARM->_slk == NULL)
     17263+    if (SP_PARM == 0 || SP_PARM->_slk == 0)
    1721017264        returnCode(ERR);
    1721117265-    SP->_slk->dirty = TRUE;
     
    1722417278diff -Naur ncurses-5.7.orig/ncurses/base/lib_ungetch.c ncurses-5.7/ncurses/base/lib_ungetch.c
    1722517279--- ncurses-5.7.orig/ncurses/base/lib_ungetch.c 2008-05-31 09:44:54.000000000 -0700
    17226 +++ ncurses-5.7/ncurses/base/lib_ungetch.c      2009-02-15 23:21:24.628481072 -0800
     17280+++ ncurses-5.7/ncurses/base/lib_ungetch.c      2009-02-22 21:40:17.914529962 -0800
    1722717281@@ -1,5 +1,5 @@
    1722817282 /****************************************************************************
     
    1726817322 }
    1726917323+#endif
     17324diff -Naur ncurses-5.7.orig/ncurses/base/lib_winch.c ncurses-5.7/ncurses/base/lib_winch.c
     17325--- ncurses-5.7.orig/ncurses/base/lib_winch.c   2001-06-02 16:42:08.000000000 -0700
     17326+++ ncurses-5.7/ncurses/base/lib_winch.c        2009-02-22 21:40:19.478632211 -0800
     17327@@ -39,16 +39,16 @@
     17328 
     17329 #include <curses.priv.h>
     17330 
     17331-MODULE_ID("$Id: lib_winch.c,v 1.5 2001/06/02 23:42:08 skimo Exp $")
     17332+MODULE_ID("$Id: lib_winch.c,v 1.6 2008/11/16 00:19:59 juergen Exp $")
     17333 
     17334 NCURSES_EXPORT(chtype)
     17335 winch(WINDOW *win)
     17336 {
     17337     T((T_CALLED("winch(%p)"), win));
     17338     if (win != 0) {
     17339-       returnChar(CharOf(win->_line[win->_cury].text[win->_curx]) |
     17340-                  AttrOf(win->_line[win->_cury].text[win->_curx]));
     17341+       returnChtype(CharOf(win->_line[win->_cury].text[win->_curx]) |
     17342+                    AttrOf(win->_line[win->_cury].text[win->_curx]));
     17343     } else {
     17344-       returnChar(0);
     17345+       returnChtype(0);
     17346     }
     17347 }
    1727017348diff -Naur ncurses-5.7.orig/ncurses/base/MKkeyname.awk ncurses-5.7/ncurses/base/MKkeyname.awk
    1727117349--- ncurses-5.7.orig/ncurses/base/MKkeyname.awk 2008-07-12 11:40:00.000000000 -0700
    17272 +++ ncurses-5.7/ncurses/base/MKkeyname.awk      2009-02-15 23:21:24.620481072 -0800
     17350+++ ncurses-5.7/ncurses/base/MKkeyname.awk      2009-02-22 21:40:17.906529403 -0800
    1727317351@@ -1,6 +1,6 @@
    1727417352-# $Id: MKkeyname.awk,v 1.40 2008/07/12 18:40:00 tom Exp $
     
    1730317381        print "void _nc_keyname_leaks(void)"
    1730417382        print "{"
     17383diff -Naur ncurses-5.7.orig/ncurses/base/MKlib_gen.sh ncurses-5.7/ncurses/base/MKlib_gen.sh
     17384--- ncurses-5.7.orig/ncurses/base/MKlib_gen.sh  2008-08-30 12:20:50.000000000 -0700
     17385+++ ncurses-5.7/ncurses/base/MKlib_gen.sh       2009-02-22 21:40:19.478632211 -0800
     17386@@ -2,7 +2,7 @@
     17387 #
     17388 # MKlib_gen.sh -- generate sources from curses.h macro definitions
     17389 #
     17390-# ($Id: MKlib_gen.sh,v 1.34 2008/08/30 19:20:50 tom Exp $)
     17391+# ($Id: MKlib_gen.sh,v 1.35 2008/11/16 00:19:59 juergen Exp $)
     17392 #
     17393 ##############################################################################
     17394 # Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
     17395@@ -199,7 +199,7 @@
     17396        }
     17397        second = first + 1;
     17398        if ( $first == "chtype" ) {
     17399-               returnType = "Char";
     17400+               returnType = "Chtype";
     17401        } else if ( $first == "SCREEN" ) {
     17402                returnType = "SP";
     17403        } else if ( $first == "WINDOW" ) {
     17404diff -Naur ncurses-5.7.orig/ncurses/base/tries.c ncurses-5.7/ncurses/base/tries.c
     17405--- ncurses-5.7.orig/ncurses/base/tries.c       2008-08-16 12:22:55.000000000 -0700
     17406+++ ncurses-5.7/ncurses/base/tries.c    2009-02-22 21:40:19.478632211 -0800
     17407@@ -39,7 +39,7 @@
     17408 
     17409 #include <curses.priv.h>
     17410 
     17411-MODULE_ID("$Id: tries.c,v 1.27 2008/08/16 19:22:55 tom Exp $")
     17412+MODULE_ID("$Id: tries.c,v 1.28 2008/11/16 00:19:59 juergen Exp $")
     17413 
     17414 /*
     17415  * Expand a keycode into the string that it corresponds to, returning null if
     17416@@ -72,7 +72,9 @@
     17417            *((unsigned char *) (result + len)) = 128;
     17418 #ifdef TRACE
     17419        if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) {
     17420-           _tracef("expand_key %s %s", _nc_tracechar(SP, code), _nc_visbuf(result));
     17421+           _tracef("expand_key %s %s",
     17422+                   _nc_tracechar(CURRENT_SCREEN, code),
     17423+                   _nc_visbuf(result));
     17424            _nc_unlock_global(tracef);
     17425        }
     17426 #endif
    1730517427diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h
    1730617428--- ncurses-5.7.orig/ncurses/curses.priv.h      2008-10-04 14:37:45.000000000 -0700
    17307 +++ ncurses-5.7/ncurses/curses.priv.h   2009-02-15 23:21:24.628481072 -0800
     17429+++ ncurses-5.7/ncurses/curses.priv.h   2009-02-22 21:40:19.478632211 -0800
    1730817430@@ -1,5 +1,5 @@
    1730917431 /****************************************************************************
     
    1731817440 /*
    1731917441- * $Id: curses.priv.h,v 1.394 2008/10/04 21:37:45 tom Exp $
    17320 + * $Id: curses.priv.h,v 1.399 2009/02/15 01:05:47 tom Exp $
     17442+ * $Id: curses.priv.h,v 1.402 2009/02/21 22:54:34 tom Exp $
    1732117443  *
    1732217444  *     curses.priv.h
     
    1737017492 #include <term_entry.h>
    1737117493 #include <nc_tparm.h>
     17494@@ -289,7 +319,7 @@
     17495 #if NCURSES_NO_PADDING
     17496 #define GetNoPadding(sp)       ((sp) ? (sp)->_no_padding : _nc_prescreen._no_padding)
     17497 #define SetNoPadding(sp)       _nc_set_no_padding(sp)
     17498-extern NCURSES_EXPORT(void) _nc_set_no_padding(SCREEN *);
     17499+extern NCURSES_EXPORT(void)     _nc_set_no_padding(SCREEN *);
     17500 #else
     17501 #define GetNoPadding(sp)       FALSE
     17502 #define SetNoPadding(sp)       /*nothing*/
    1737217503@@ -404,6 +434,8 @@
    1737317504 #define C_SHIFT 9              /* we need more bits than there are colors */
     
    1737917510 
    1738017511 #define COLOR_DEFAULT          C_MASK
     17512@@ -464,13 +496,13 @@
     17513 } slk_ent;
     17514 
     17515 typedef struct _SLK {
     17516-       char dirty;             /* all labels have changed */
     17517-       char hidden;            /* soft labels are hidden */
     17518-       WINDOW *win;
     17519+       bool    dirty;          /* all labels have changed */
     17520+       bool    hidden;         /* soft labels are hidden */
     17521+       WINDOW  *win;
     17522        slk_ent *ent;
     17523-       short  maxlab;          /* number of available labels */
     17524-       short  labcnt;          /* number of allocated labels */
     17525-       short  maxlen;          /* length of labels */
     17526+       short   maxlab;         /* number of available labels */
     17527+       short   labcnt;         /* number of allocated labels */
     17528+       short   maxlen;         /* length of labels */
     17529        NCURSES_CH_T attr;      /* soft label attribute */
     17530 } SLK;
     17531 
    1738117532@@ -703,6 +735,8 @@
    1738217533        char            *_setbuf;       /* buffered I/O for output          */
    1738317534        bool            _filtered;      /* filter() was called              */
    1738417535        bool            _buffered;      /* setvbuf uses _setbuf data        */
    17385 +        bool            _prescreen;     /* is in prescreen phase            */
    17386 +        bool            _use_env;       /* LINES & COLS from environment?   */
     17536+       bool            _prescreen;     /* is in prescreen phase            */
     17537+       bool            _use_env;       /* LINES & COLS from environment?   */
    1738717538        int             _checkfd;       /* filedesc for typeahead check     */
    1738817539        TERMINAL        *_term;         /* terminal type information        */
     
    1740217553        chtype          _ok_attributes; /* valid attributes for terminal     */
    1740317554        chtype          _xmc_suppress;  /* attributes to suppress if xmc     */
     17555@@ -1263,7 +1299,7 @@
     17556 #define returnBool(code)       TRACE_RETURN(code,bool)
     17557 #define returnCPtr(code)       TRACE_RETURN(code,cptr)
     17558 #define returnCVoidPtr(code)   TRACE_RETURN(code,cvoid_ptr)
     17559-#define returnChar(code)       TRACE_RETURN(code,chtype)
     17560+#define returnChtype(code)     TRACE_RETURN(code,chtype)
     17561 #define returnCode(code)       TRACE_RETURN(code,int)
     17562 #define returnPtr(code)                TRACE_RETURN(code,ptr)
     17563 #define returnSP(code)         TRACE_RETURN(code,sp)
     17564@@ -1322,7 +1358,7 @@
     17565 #define returnBool(code)       return code
     17566 #define returnCPtr(code)       return code
     17567 #define returnCVoidPtr(code)   return code
     17568-#define returnChar(code)       return code
     17569+#define returnChtype(code)     return code
     17570 #define returnCode(code)       return code
     17571 #define returnPtr(code)                return code
     17572 #define returnSP(code)         return code
    1740417573@@ -1519,7 +1555,7 @@
    1740517574 extern NCURSES_EXPORT(void) _nc_screen_wrap (void);
     
    1742017589  * We don't want to use the lines or columns capabilities internally, because
    1742117590  * if the application is running multiple screens under X, it's quite possible
     17591@@ -1715,6 +1753,66 @@
     17592 #define MSG_NO_MEMORY "Out of memory"
     17593 #define MSG_NO_INPUTS "Premature EOF"
     17594 
     17595+/* timed_wait flag definitions */
     17596+#define TW_NONE    0
     17597+#define TW_INPUT   1
     17598+#define TW_MOUSE   2
     17599+#define TW_ANY     (TW_INPUT | TW_MOUSE)
     17600+#define TW_EVENT   4
     17601+
     17602+/*
     17603+ * Exported entrypoints beyond the published API
     17604+ */
     17605+extern NCURSES_EXPORT(WINDOW *) _nc_curscr_of(SCREEN*);
     17606+extern NCURSES_EXPORT(WINDOW *) _nc_newscr_of(SCREEN*);
     17607+extern NCURSES_EXPORT(WINDOW *) _nc_stdscr_of(SCREEN*);
     17608+extern NCURSES_EXPORT(int)      _nc_outc_wrapper(SCREEN*,int);
     17609+
     17610+extern NCURSES_EXPORT(TERMINAL*) NCURSES_SP_NAME(_nc_set_curterm)(SCREEN*,TERMINAL*);
     17611+extern NCURSES_EXPORT(int)       NCURSES_SP_NAME(_nc_del_curterm)(SCREEN*,TERMINAL*);
     17612+
     17613+#if NCURSES_EXT_FUNCS
     17614+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_set_tabsize)(SCREEN*, int);
     17615+#endif
     17616+
     17617+extern NCURSES_EXPORT(chtype)   NCURSES_SP_NAME(_nc_acs_char)(SCREEN*,int);
     17618+
     17619+/*
     17620+ * We put the safe versions of various calls here as they are not published
     17621+ * part of the API up to now
     17622+ */
     17623+extern NCURSES_EXPORT(SCREEN*)  _nc_SP(void);
     17624+
     17625+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_vidputs)(SCREEN*,chtype,int(*) (SCREEN*, int));
     17626+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_vidattr)(SCREEN *, chtype);
     17627+
     17628+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_scr_restore)(SCREEN*, const char*);
     17629+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_scr_init)(SCREEN*,const char*);
     17630+
     17631+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_restartterm)(SCREEN*,NCURSES_CONST char*,int,int*);
     17632+extern NCURSES_EXPORT(bool)     NCURSES_SP_NAME(_nc_is_term_resized)(SCREEN*,int,int);
     17633+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_resize_term)(SCREEN*,int,int);
     17634+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_resizeterm)(SCREEN*,int,int);
     17635+
     17636+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *);
     17637+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tputs)(SCREEN*,const char*,int,int(*)(SCREEN*, int));
     17638+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_savetty)(SCREEN*);
     17639+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_resetty)(SCREEN*);
     17640+
     17641+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_mcprint)(SCREEN*,char*, int);
     17642+extern NCURSES_EXPORT(char *)   NCURSES_SP_NAME(_nc_tgetstr)(SCREEN*,NCURSES_CONST char*,char**);
     17643+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tgetflag)(SCREEN*,NCURSES_CONST char*);
     17644+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tgetnum)(SCREEN*,NCURSES_CONST char*);
     17645+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tigetflag)(SCREEN*,NCURSES_CONST char*);
     17646+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tigetnum)(SCREEN*,NCURSES_CONST char*);
     17647+extern NCURSES_EXPORT(char *)   NCURSES_SP_NAME(_nc_tigetstr)(SCREEN*, NCURSES_CONST char*);
     17648+extern NCURSES_EXPORT(void)     _nc_cookie_init(SCREEN *sp);
     17649+extern NCURSES_EXPORT(int)      _nc_tinfo_doupdate(SCREEN *sp);
     17650+extern NCURSES_EXPORT(int)      _nc_tinfo_mcprint(SCREEN*,char*,int);
     17651+#if USE_WIDEC_SUPPORT
     17652+extern NCURSES_EXPORT(wchar_t *) NCURSES_SP_NAME(_nc_wunctrl)(SCREEN*, cchar_t *);
     17653+#endif
     17654+
     17655 #ifdef __cplusplus
     17656 }
     17657 #endif
    1742217658diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in
    1742317659--- ncurses-5.7.orig/ncurses/Makefile.in        2008-10-18 07:11:54.000000000 -0700
    17424 +++ ncurses-5.7/ncurses/Makefile.in     2009-02-15 23:21:09.919538762 -0800
     17660+++ ncurses-5.7/ncurses/Makefile.in     2009-02-22 21:40:02.905568096 -0800
    1742517661@@ -1,6 +1,6 @@
    1742617662-# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $
     
    1744317679diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c
    1744417680--- ncurses-5.7.orig/ncurses/tinfo/entries.c    2008-09-27 06:11:10.000000000 -0700
    17445 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-02-15 23:21:03.083101270 -0800
     17681+++ ncurses-5.7/ncurses/tinfo/entries.c 2009-02-22 21:39:55.861116636 -0800
    1744617682@@ -37,7 +37,7 @@
    1744717683 #include <tic.h>
     
    1746517701diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c
    1746617702--- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c  2006-08-19 12:48:38.000000000 -0700
    17467 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c       2009-02-15 23:21:04.663202123 -0800
     17703+++ ncurses-5.7/ncurses/tinfo/hashed_db.c       2009-02-22 21:39:57.593227825 -0800
    1746817704@@ -1,5 +1,5 @@
    1746917705 /****************************************************************************
     
    1757117807diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.7/ncurses/tinfo/lib_baudrate.c
    1757217808--- ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c       2008-06-28 08:19:24.000000000 -0700
    17573 +++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c    2009-02-15 23:21:24.628481072 -0800
     17809+++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c    2009-02-22 21:40:17.918530520 -0800
    1757417810@@ -1,5 +1,5 @@
    1757517811 /****************************************************************************
     
    1762017856diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c ncurses-5.7/ncurses/tinfo/lib_has_cap.c
    1762117857--- ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c        2003-10-25 12:43:55.000000000 -0700
    17622 +++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c     2009-02-15 23:21:24.632481631 -0800
     17858+++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c     2009-02-22 21:40:17.918530520 -0800
    1762317859@@ -1,5 +1,5 @@
    1762417860 /****************************************************************************
     
    1768017916diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c ncurses-5.7/ncurses/tinfo/lib_kernel.c
    1768117917--- ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c 2004-05-08 10:11:21.000000000 -0700
    17682 +++ ncurses-5.7/ncurses/tinfo/lib_kernel.c      2009-02-15 23:21:24.632481631 -0800
     17918+++ ncurses-5.7/ncurses/tinfo/lib_kernel.c      2009-02-22 21:40:17.918530520 -0800
    1768317919@@ -1,5 +1,5 @@
    1768417920 /****************************************************************************
     
    1779118027diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_longname.c ncurses-5.7/ncurses/tinfo/lib_longname.c
    1779218028--- ncurses-5.7.orig/ncurses/tinfo/lib_longname.c       2000-12-09 18:55:07.000000000 -0800
    17793 +++ ncurses-5.7/ncurses/tinfo/lib_longname.c    2009-02-15 23:21:24.632481631 -0800
     18029+++ ncurses-5.7/ncurses/tinfo/lib_longname.c    2009-02-22 21:40:17.918530520 -0800
    1779418030@@ -1,5 +1,5 @@
    1779518031 /****************************************************************************
     
    1783518071diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_napms.c ncurses-5.7/ncurses/tinfo/lib_napms.c
    1783618072--- ncurses-5.7.orig/ncurses/tinfo/lib_napms.c  2008-05-03 14:34:13.000000000 -0700
    17837 +++ ncurses-5.7/ncurses/tinfo/lib_napms.c       2009-02-15 23:21:24.632481631 -0800
     18073+++ ncurses-5.7/ncurses/tinfo/lib_napms.c       2009-02-22 21:40:17.918530520 -0800
    1783818074@@ -1,5 +1,5 @@
    1783918075 /****************************************************************************
     
    1787918115diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_options.c ncurses-5.7/ncurses/tinfo/lib_options.c
    1788018116--- ncurses-5.7.orig/ncurses/tinfo/lib_options.c        2008-08-16 14:20:48.000000000 -0700
    17881 +++ ncurses-5.7/ncurses/tinfo/lib_options.c     2009-02-15 23:21:24.632481631 -0800
     18117+++ ncurses-5.7/ncurses/tinfo/lib_options.c     2009-02-22 21:40:17.918530520 -0800
    1788218118@@ -1,5 +1,5 @@
    1788318119 /****************************************************************************
     
    1796518201diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_raw.c ncurses-5.7/ncurses/tinfo/lib_raw.c
    1796618202--- ncurses-5.7.orig/ncurses/tinfo/lib_raw.c    2007-09-29 14:50:22.000000000 -0700
    17967 +++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-02-15 23:21:24.632481631 -0800
     18203+++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-02-22 21:40:17.918530520 -0800
    1796818204@@ -1,5 +1,5 @@
    1796918205 /****************************************************************************
     
    1821418450diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_setup.c ncurses-5.7/ncurses/tinfo/lib_setup.c
    1821518451--- ncurses-5.7.orig/ncurses/tinfo/lib_setup.c  2008-08-03 15:42:33.000000000 -0700
    18216 +++ ncurses-5.7/ncurses/tinfo/lib_setup.c       2009-02-15 23:21:24.632481631 -0800
     18452+++ ncurses-5.7/ncurses/tinfo/lib_setup.c       2009-02-22 21:40:17.918530520 -0800
    1821718453@@ -1,5 +1,5 @@
    1821818454 /****************************************************************************
     
    1830318539diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termname.c ncurses-5.7/ncurses/tinfo/lib_termname.c
    1830418540--- ncurses-5.7.orig/ncurses/tinfo/lib_termname.c       2003-12-27 10:23:01.000000000 -0800
    18305 +++ ncurses-5.7/ncurses/tinfo/lib_termname.c    2009-02-15 23:21:24.632481631 -0800
     18541+++ ncurses-5.7/ncurses/tinfo/lib_termname.c    2009-02-22 21:40:19.482631931 -0800
    1830618542@@ -1,5 +1,5 @@
    1830718543 /****************************************************************************
     
    1831618552 
    1831718553-MODULE_ID("$Id: lib_termname.c,v 1.8 2003/12/27 18:23:01 tom Exp $")
    18318 +MODULE_ID("$Id: lib_termname.c,v 1.10 2009/02/15 01:07:06 tom Exp $")
     18554+MODULE_ID("$Id: lib_termname.c,v 1.11 2009/02/21 16:37:12 tom Exp $")
    1831918555 
    1832018556 NCURSES_EXPORT(char *)
     
    1832418560     char *name = 0;
    1832518561 
    18326      T((T_CALLED("termname()")));
     18562-    T((T_CALLED("termname()")));
     18563+    T((T_CALLED("termname(%p)"), SP_PARM));
    1832718564 
    1832818565+#if NCURSES_SP_FUNCS
     
    1834518582+}
    1834618583+#endif
     18584diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c ncurses-5.7/ncurses/tinfo/lib_tparm.c
     18585--- ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c  2008-08-16 12:22:55.000000000 -0700
     18586+++ ncurses-5.7/ncurses/tinfo/lib_tparm.c       2009-02-22 21:40:19.482631931 -0800
     18587@@ -40,10 +40,9 @@
     18588 #include <curses.priv.h>
     18589 
     18590 #include <ctype.h>
     18591-#include <term.h>
     18592 #include <tic.h>
     18593 
     18594-MODULE_ID("$Id: lib_tparm.c,v 1.76 2008/08/16 19:22:55 tom Exp $")
     18595+MODULE_ID("$Id: lib_tparm.c,v 1.77 2008/11/16 00:19:59 juergen Exp $")
     18596 
     18597 /*
     18598  *     char *
    1834718599diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c ncurses-5.7/ncurses/tinfo/lib_tputs.c
    1834818600--- ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c  2008-06-28 06:12:15.000000000 -0700
    18349 +++ ncurses-5.7/ncurses/tinfo/lib_tputs.c       2009-02-15 23:21:24.632481631 -0800
     18601+++ ncurses-5.7/ncurses/tinfo/lib_tputs.c       2009-02-22 21:40:17.918530520 -0800
    1835018602@@ -1,5 +1,5 @@
    1835118603 /****************************************************************************
     
    1839818650diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.7/ncurses/tinfo/lib_ttyflags.c
    1839918651--- ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c       2008-08-03 15:10:44.000000000 -0700
    18400 +++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c    2009-02-15 23:21:24.632481631 -0800
     18652+++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c    2009-02-22 21:40:17.918530520 -0800
    1840118653@@ -1,5 +1,5 @@
    1840218654 /****************************************************************************
     
    1851218764 saved_tty(void)
    1851318765 {
     18766diff -Naur ncurses-5.7.orig/ncurses/tinfo/make_keys.c ncurses-5.7/ncurses/tinfo/make_keys.c
     18767--- ncurses-5.7.orig/ncurses/tinfo/make_keys.c  2008-08-03 14:57:22.000000000 -0700
     18768+++ ncurses-5.7/ncurses/tinfo/make_keys.c       2009-02-22 21:40:19.482631931 -0800
     18769@@ -39,16 +39,16 @@
     18770 #define USE_TERMLIB 1
     18771 #include <curses.priv.h>
     18772 
     18773-MODULE_ID("$Id: make_keys.c,v 1.14 2008/08/03 21:57:22 tom Exp $")
     18774+MODULE_ID("$Id: make_keys.c,v 1.15 2008/11/16 00:19:59 juergen Exp $")
     18775 
     18776 #include <names.c>
     18777 
     18778 #define UNKNOWN (SIZEOF(strnames) + SIZEOF(strfnames))
     18779 
     18780-static size_t
     18781+static unsigned
     18782 lookup(const char *name)
     18783 {
     18784-    size_t n;
     18785+    unsigned n;
     18786     bool found = FALSE;
     18787     for (n = 0; strnames[n] != 0; n++) {
     18788        if (!strcmp(name, strnames[n])) {
     18789@@ -73,7 +73,7 @@
     18790     char buffer[BUFSIZ];
     18791     char from[256];
     18792     char to[256];
     18793-    int maxlen = 16;
     18794+    unsigned maxlen = 16;
     18795     int scanned;
     18796 
     18797     while (fgets(buffer, sizeof(buffer), ifp) != 0) {
     18798@@ -85,10 +85,10 @@
     18799 
     18800        scanned = sscanf(buffer, "%255s %255s", to, from);
     18801        if (scanned == 2) {
     18802-           int code = lookup(from);
     18803+           unsigned code = lookup(from);
     18804            if (code == UNKNOWN)
     18805                continue;
     18806-           if ((int) strlen(from) > maxlen)
     18807+           if (strlen(from) > maxlen)
     18808                maxlen = strlen(from);
     18809            fprintf(ofp, "\t{ %4d, %-*.*s },\t/* %s */\n",
     18810                    code,
     18811diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKnames.awk ncurses-5.7/ncurses/tinfo/MKnames.awk
     18812--- ncurses-5.7.orig/ncurses/tinfo/MKnames.awk  2008-10-11 14:07:56.000000000 -0700
     18813+++ ncurses-5.7/ncurses/tinfo/MKnames.awk       2009-02-22 21:40:19.482631931 -0800
     18814@@ -25,7 +25,7 @@
     18815 # use or other dealings in this Software without prior written               #
     18816 # authorization.                                                             #
     18817 ##############################################################################
     18818-# $Id: MKnames.awk,v 1.20 2008/10/11 21:07:56 tom Exp $
     18819+# $Id: MKnames.awk,v 1.21 2008/11/16 00:19:59 juergen Exp $
     18820 function large_item(value) {
     18821        result = sprintf("%d,", offset);
     18822        offset = offset + length(value) + 1;
     18823@@ -107,8 +107,6 @@
     18824                print  ""
     18825                print  "#if BROKEN_LINKER || USE_REENTRANT"
     18826                print  ""
     18827-               print  "#include <term.h>"
     18828-               print  ""
     18829                if (bigstrings) {
     18830                        printf "static const char _nc_name_blob[] = \n"
     18831                        printf "%s;\n", bigstr;
     18832diff -Naur ncurses-5.7.orig/ncurses/tinfo/name_match.c ncurses-5.7/ncurses/tinfo/name_match.c
     18833--- ncurses-5.7.orig/ncurses/tinfo/name_match.c 2008-08-03 12:49:33.000000000 -0700
     18834+++ ncurses-5.7/ncurses/tinfo/name_match.c      2009-02-22 21:40:19.482631931 -0800
     18835@@ -31,10 +31,9 @@
     18836  ****************************************************************************/
     18837 
     18838 #include <curses.priv.h>
     18839-#include <term.h>
     18840 #include <tic.h>
     18841 
     18842-MODULE_ID("$Id: name_match.c,v 1.17 2008/08/03 19:49:33 tom Exp $")
     18843+MODULE_ID("$Id: name_match.c,v 1.18 2008/11/16 00:19:59 juergen Exp $")
     18844 
     18845 /*
     18846  *     _nc_first_name(char *names)
     18847diff -Naur ncurses-5.7.orig/ncurses/tinfo/use_screen.c ncurses-5.7/ncurses/tinfo/use_screen.c
     18848--- ncurses-5.7.orig/ncurses/tinfo/use_screen.c 2008-06-07 12:16:56.000000000 -0700
     18849+++ ncurses-5.7/ncurses/tinfo/use_screen.c      2009-02-22 21:40:19.482631931 -0800
     18850@@ -32,7 +32,7 @@
     18851 
     18852 #include <curses.priv.h>
     18853 
     18854-MODULE_ID("$Id: use_screen.c,v 1.6 2008/06/07 19:16:56 tom Exp $")
     18855+MODULE_ID("$Id: use_screen.c,v 1.7 2008/11/16 00:19:59 juergen Exp $")
     18856 
     18857 NCURSES_EXPORT(int)
     18858 use_screen(SCREEN *screen, NCURSES_SCREEN_CB func, void *data)
     18859@@ -47,7 +47,7 @@
     18860      * recurred through this point, return an error if so.
     18861      */
     18862     _nc_lock_global(curses);
     18863-    save_SP = SP;
     18864+    save_SP = CURRENT_SCREEN;
     18865     set_term(screen);
     18866 
     18867     code = func(screen, data);
     18868diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracebits.c ncurses-5.7/ncurses/trace/lib_tracebits.c
     18869--- ncurses-5.7.orig/ncurses/trace/lib_tracebits.c      2008-08-03 09:09:26.000000000 -0700
     18870+++ ncurses-5.7/ncurses/trace/lib_tracebits.c   2009-02-22 21:40:19.482631931 -0800
     18871@@ -33,9 +33,8 @@
     18872  ****************************************************************************/
     18873 
     18874 #include <curses.priv.h>
     18875-#include <term.h>              /* cur_term */
     18876 
     18877-MODULE_ID("$Id: lib_tracebits.c,v 1.17 2008/08/03 16:09:26 tom Exp $")
     18878+MODULE_ID("$Id: lib_tracebits.c,v 1.18 2008/11/16 00:19:59 juergen Exp $")
     18879 
     18880 #if SVR4_TERMIO && !defined(_POSIX_SOURCE)
     18881 #define _POSIX_SOURCE
     18882diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracemse.c ncurses-5.7/ncurses/trace/lib_tracemse.c
     18883--- ncurses-5.7.orig/ncurses/trace/lib_tracemse.c       2008-08-03 08:39:29.000000000 -0700
     18884+++ ncurses-5.7/ncurses/trace/lib_tracemse.c    2009-02-22 21:40:19.482631931 -0800
     18885@@ -38,7 +38,7 @@
     18886 
     18887 #include <curses.priv.h>
     18888 
     18889-MODULE_ID("$Id: lib_tracemse.c,v 1.15 2008/08/03 15:39:29 tom Exp $")
     18890+MODULE_ID("$Id: lib_tracemse.c,v 1.16 2008/11/16 00:19:59 juergen Exp $")
     18891 
     18892 #ifdef TRACE
     18893 
     18894@@ -117,7 +117,7 @@
     18895 NCURSES_EXPORT(char *)
     18896 _tracemouse(MEVENT const *ep)
     18897 {
     18898-    return _nc_tracemouse(SP, ep);
     18899+    return _nc_tracemouse(CURRENT_SCREEN, ep);
     18900 }
     18901 
     18902 #else /* !TRACE */
     18903diff -Naur ncurses-5.7.orig/ncurses/trace/varargs.c ncurses-5.7/ncurses/trace/varargs.c
     18904--- ncurses-5.7.orig/ncurses/trace/varargs.c    2008-08-03 08:42:49.000000000 -0700
     18905+++ ncurses-5.7/ncurses/trace/varargs.c 2009-02-22 21:40:19.482631931 -0800
     18906@@ -34,7 +34,7 @@
     18907 
     18908 #include <ctype.h>
     18909 
     18910-MODULE_ID("$Id: varargs.c,v 1.7 2008/08/03 15:42:49 tom Exp $")
     18911+MODULE_ID("$Id: varargs.c,v 1.8 2008/11/16 00:19:59 juergen Exp $")
     18912 
     18913 #ifdef TRACE
     18914 
     18915@@ -44,7 +44,7 @@
     18916     atUnknown = 0, atInteger, atFloat, atPoint, atString
     18917 } ARGTYPE;
     18918 
     18919-#define VA_INT(type) ival = va_arg(ap, type)
     18920+#define VA_INT(type) ival = (int) va_arg(ap, type)
     18921 #define VA_FLT(type) fval = va_arg(ap, type)
     18922 #define VA_PTR(type) pval = (char *)va_arg(ap, type)
     18923 #define VA_STR(type) sval = va_arg(ap, type)
    1851418924diff -Naur ncurses-5.7.orig/ncurses/tty/lib_mvcur.c ncurses-5.7/ncurses/tty/lib_mvcur.c
    1851518925--- ncurses-5.7.orig/ncurses/tty/lib_mvcur.c    2008-08-16 12:30:58.000000000 -0700
    18516 +++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-02-15 23:21:24.632481631 -0800
     18926+++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-02-22 21:40:17.922530520 -0800
    1851718927@@ -1,5 +1,5 @@
    1851818928 /****************************************************************************
     
    1860519015diff -Naur ncurses-5.7.orig/ncurses/tty/lib_vidattr.c ncurses-5.7/ncurses/tty/lib_vidattr.c
    1860619016--- ncurses-5.7.orig/ncurses/tty/lib_vidattr.c  2007-06-30 14:58:04.000000000 -0700
    18607 +++ ncurses-5.7/ncurses/tty/lib_vidattr.c       2009-02-15 23:21:24.636481910 -0800
     19017+++ ncurses-5.7/ncurses/tty/lib_vidattr.c       2009-02-22 21:40:19.482631931 -0800
    1860819018@@ -1,5 +1,5 @@
    1860919019 /****************************************************************************
     
    1862819038 
    1862919039-MODULE_ID("$Id: lib_vidattr.c,v 1.49 2007/06/30 21:58:04 tom Exp $")
    18630 +MODULE_ID("$Id: lib_vidattr.c,v 1.50 2009/02/15 00:51:03 tom Exp $")
     19040+MODULE_ID("$Id: lib_vidattr.c,v 1.51 2009/02/21 21:43:40 tom Exp $")
    1863119041 
    1863219042 #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
     
    1864919059        attrs |= A_COLOR;
    1865019060 
    18651      returnChar(attrs);
     19061-    returnChar(attrs);
     19062+    returnChtype(attrs);
    1865219063 }
    1865319064+
     
    1866119072diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c
    1866219073--- ncurses-5.7.orig/ncurses/tty/tty_update.c   2008-08-30 13:08:19.000000000 -0700
    18663 +++ ncurses-5.7/ncurses/tty/tty_update.c        2009-02-15 23:21:24.636481910 -0800
     19074+++ ncurses-5.7/ncurses/tty/tty_update.c        2009-02-22 21:40:17.922530520 -0800
    1866419075@@ -1,5 +1,5 @@
    1866519076 /****************************************************************************
     
    1880619217                        SetPair(oldLine[n], GetPair(newLine[n]));
    1880719218                    }
     19219diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_cchar.c ncurses-5.7/ncurses/widechar/lib_cchar.c
     19220--- ncurses-5.7.orig/ncurses/widechar/lib_cchar.c       2007-05-12 12:03:06.000000000 -0700
     19221+++ ncurses-5.7/ncurses/widechar/lib_cchar.c    2009-02-22 21:40:19.482631931 -0800
     19222@@ -1,5 +1,5 @@
     19223 /****************************************************************************
     19224- * Copyright (c) 2001-2005,2007 Free Software Foundation, Inc.              *
     19225+ * Copyright (c) 2001-2007,2008 Free Software Foundation, Inc.              *
     19226  *                                                                          *
     19227  * Permission is hereby granted, free of charge, to any person obtaining a  *
     19228  * copy of this software and associated documentation files (the            *
     19229@@ -35,7 +35,7 @@
     19230 
     19231 #include <curses.priv.h>
     19232 
     19233-MODULE_ID("$Id: lib_cchar.c,v 1.12 2007/05/12 19:03:06 tom Exp $")
     19234+MODULE_ID("$Id: lib_cchar.c,v 1.13 2008/11/16 00:19:59 juergen Exp $")
     19235 
     19236 /*
     19237  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
     19238@@ -50,8 +50,8 @@
     19239         short color_pair,
     19240         const void *opts)
     19241 {
     19242-    int i;
     19243-    int len;
     19244+    unsigned i;
     19245+    unsigned len;
     19246     int code = OK;
     19247 
     19248     TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"),
     19249diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c ncurses-5.7/ncurses/widechar/lib_get_wstr.c
     19250--- ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c    2008-08-16 12:25:33.000000000 -0700
     19251+++ ncurses-5.7/ncurses/widechar/lib_get_wstr.c 2009-02-22 21:40:19.482631931 -0800
     19252@@ -38,9 +38,8 @@
     19253 */
     19254 
     19255 #include <curses.priv.h>
     19256-#include <term.h>
     19257 
     19258-MODULE_ID("$Id: lib_get_wstr.c,v 1.10 2008/08/16 19:25:33 tom Exp $")
     19259+MODULE_ID("$Id: lib_get_wstr.c,v 1.11 2008/11/16 00:19:59 juergen Exp $")
     19260 
     19261 static int
     19262 wadd_wint(WINDOW *win, wint_t *src)
     19263diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_wacs.c ncurses-5.7/ncurses/widechar/lib_wacs.c
     19264--- ncurses-5.7.orig/ncurses/widechar/lib_wacs.c        2006-12-17 07:16:17.000000000 -0800
     19265+++ ncurses-5.7/ncurses/widechar/lib_wacs.c     2009-02-22 21:40:19.482631931 -0800
     19266@@ -31,9 +31,8 @@
     19267  ****************************************************************************/
     19268 
     19269 #include <curses.priv.h>
     19270-#include <term.h>
     19271 
     19272-MODULE_ID("$Id: lib_wacs.c,v 1.7 2006/12/17 15:16:17 tom Exp $")
     19273+MODULE_ID("$Id: lib_wacs.c,v 1.8 2008/11/16 00:19:59 juergen Exp $")
     19274 
     19275 NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0;
     19276 
    1880819277diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS
    1880919278--- ncurses-5.7.orig/NEWS       2008-11-01 17:56:22.000000000 -0700
    18810 +++ ncurses-5.7/NEWS    2009-02-15 23:21:24.600479396 -0800
     19279+++ ncurses-5.7/NEWS    2009-02-22 21:40:19.474632211 -0800
    1881119280@@ -1,5 +1,5 @@
    1881219281 -------------------------------------------------------------------------------
     
    1882119290 -------------------------------------------------------------------------------
    1882219291--- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $
    18823 +-- $Id: NEWS,v 1.1364 2009/02/15 00:20:00 tom Exp $
     19292+-- $Id: NEWS,v 1.1365 2009/02/22 02:05:30 tom Exp $
    1882419293 -------------------------------------------------------------------------------
    1882519294 
    1882619295 This is a log of changes that ncurses has gone through since Zeyd started
    18827 @@ -45,6 +45,150 @@
     19296@@ -45,6 +45,153 @@
    1882819297 Changes through 1.9.9e did not credit all contributions;
    1882919298 it is not possible to add this information.
    1883019299 
     19300+20090221
     19301+       + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete).
     19302+
    1883119303+20090214
    1883219304+       + add configure script --enable-sp-funcs to enable the new set of
     
    1897819450diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in
    1897919451--- ncurses-5.7.orig/panel/Makefile.in  2007-04-28 07:56:11.000000000 -0700
    18980 +++ ncurses-5.7/panel/Makefile.in       2009-02-15 23:21:09.919538762 -0800
     19452+++ ncurses-5.7/panel/Makefile.in       2009-02-22 21:40:02.905568096 -0800
    1898119453@@ -1,6 +1,6 @@
    1898219454-# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $
     
    1899919471diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in
    1900019472--- ncurses-5.7.orig/progs/Makefile.in  2008-09-07 06:58:55.000000000 -0700
    19001 +++ ncurses-5.7/progs/Makefile.in       2009-02-15 23:20:58.766824137 -0800
     19473+++ ncurses-5.7/progs/Makefile.in       2009-02-22 21:39:51.152816873 -0800
    1900219474@@ -1,6 +1,6 @@
    1900319475-# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $
     
    1906519537diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules
    1906619538--- ncurses-5.7.orig/progs/modules      2006-12-23 16:53:21.000000000 -0800
    19067 +++ ncurses-5.7/progs/modules   2009-02-15 23:20:58.766824137 -0800
     19539+++ ncurses-5.7/progs/modules   2009-02-22 21:39:51.152816873 -0800
    1906819540@@ -1,7 +1,7 @@
    1906919541-# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $
     
    1908619558diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c
    1908719559--- ncurses-5.7.orig/progs/tabs.c       1969-12-31 16:00:00.000000000 -0800
    19088 +++ ncurses-5.7/progs/tabs.c    2009-02-15 23:21:00.214919122 -0800
     19560+++ ncurses-5.7/progs/tabs.c    2009-02-22 21:39:52.804923033 -0800
    1908919561@@ -0,0 +1,506 @@
    1909019562+/****************************************************************************
     
    1959620068diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c
    1959720069--- ncurses-5.7.orig/test/clip_printw.c 1969-12-31 16:00:00.000000000 -0800
    19598 +++ ncurses-5.7/test/clip_printw.c      2009-02-15 23:21:06.503320016 -0800
     20070+++ ncurses-5.7/test/clip_printw.c      2009-02-22 21:39:59.253333985 -0800
    1959920071@@ -0,0 +1,360 @@
    1960020072+/****************************************************************************
     
    1996020432diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c
    1996120433--- ncurses-5.7.orig/test/demo_forms.c  2008-10-18 13:38:20.000000000 -0700
    19962 +++ ncurses-5.7/test/demo_forms.c       2009-02-15 23:21:06.503320016 -0800
     20434+++ ncurses-5.7/test/demo_forms.c       2009-02-22 21:39:59.253333985 -0800
    1996320435@@ -26,7 +26,7 @@
    1996420436  * authorization.                                                           *
     
    1999520467diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c
    1999620468--- ncurses-5.7.orig/test/edit_field.c  2008-10-18 13:40:20.000000000 -0700
    19997 +++ ncurses-5.7/test/edit_field.c       2009-02-15 23:21:06.503320016 -0800
     20469+++ ncurses-5.7/test/edit_field.c       2009-02-22 21:39:59.253333985 -0800
    1999820470@@ -26,7 +26,7 @@
    1999920471  * authorization.                                                           *
     
    2001820490diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h
    2001920491--- ncurses-5.7.orig/test/edit_field.h  2006-06-03 09:38:57.000000000 -0700
    20020 +++ ncurses-5.7/test/edit_field.h       2009-02-15 23:21:06.507320016 -0800
     20492+++ ncurses-5.7/test/edit_field.h       2009-02-22 21:39:59.253333985 -0800
    2002120493@@ -1,5 +1,5 @@
    2002220494 /****************************************************************************
     
    2004820520diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c
    2004920521--- ncurses-5.7.orig/test/filter.c      2006-12-09 08:53:47.000000000 -0800
    20050 +++ ncurses-5.7/test/filter.c   2009-02-15 23:21:03.083101270 -0800
     20522+++ ncurses-5.7/test/filter.c   2009-02-22 21:39:55.861116636 -0800
    2005120523@@ -1,5 +1,5 @@
    2005220524 /****************************************************************************
     
    2012020592diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c
    2012120593--- ncurses-5.7.orig/test/insdelln.c    1969-12-31 16:00:00.000000000 -0800
    20122 +++ ncurses-5.7/test/insdelln.c 2009-02-15 23:21:06.507320016 -0800
     20594+++ ncurses-5.7/test/insdelln.c 2009-02-22 21:39:59.253333985 -0800
    2012320595@@ -0,0 +1,380 @@
    2012420596+/****************************************************************************
     
    2050420976diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules
    2050520977--- ncurses-5.7.orig/test/modules       2007-08-18 10:57:08.000000000 -0700
    20506 +++ ncurses-5.7/test/modules    2009-02-15 23:21:06.507320016 -0800
     20978+++ ncurses-5.7/test/modules    2009-02-22 21:39:59.253333985 -0800
    2050720979@@ -1,4 +1,4 @@
    2050820980-# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $
     
    2052921001diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c
    2053021002--- ncurses-5.7.orig/test/ncurses.c     2008-09-27 07:34:58.000000000 -0700
    20531 +++ ncurses-5.7/test/ncurses.c  2009-02-15 23:21:17.380017041 -0800
     21003+++ ncurses-5.7/test/ncurses.c  2009-02-22 21:40:14.674322391 -0800
    2053221004@@ -40,7 +40,7 @@
    2053321005    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
     
    2102121493diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs
    2102221494--- ncurses-5.7.orig/test/programs      2008-08-16 14:47:39.000000000 -0700
    21023 +++ ncurses-5.7/test/programs   2009-02-15 23:21:06.507320016 -0800
     21495+++ ncurses-5.7/test/programs   2009-02-22 21:39:59.257334543 -0800
    2102421496@@ -1,4 +1,4 @@
    2102521497-# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $
     
    2104621518diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README
    2104721519--- ncurses-5.7.orig/test/README        2008-10-18 14:02:45.000000000 -0700
    21048 +++ ncurses-5.7/test/README     2009-02-15 23:21:06.503320016 -0800
     21520+++ ncurses-5.7/test/README     2009-02-22 21:39:59.253333985 -0800
    2104921521@@ -25,7 +25,7 @@
    2105021522 -- sale, use or other dealings in this Software without prior written        --
     
    2134221814diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h
    2134321815--- ncurses-5.7.orig/test/test.priv.h   2008-10-04 14:53:41.000000000 -0700
    21344 +++ ncurses-5.7/test/test.priv.h        2009-02-15 23:21:06.507320016 -0800
     21816+++ ncurses-5.7/test/test.priv.h        2009-02-22 21:39:59.257334543 -0800
    2134521817@@ -29,7 +29,7 @@
    2134621818 /****************************************************************************
     
    2136421836diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO
    2136521837--- ncurses-5.7.orig/TO-DO      2008-10-11 12:22:27.000000000 -0700
    21366 +++ ncurses-5.7/TO-DO   2009-02-15 23:21:01.795020533 -0800
     21838+++ ncurses-5.7/TO-DO   2009-02-22 21:39:54.285016622 -0800
    2136721839@@ -25,7 +25,7 @@
    2136821840 -- sale, use or other dealings in this Software without prior written        --
Note: See TracChangeset for help on using the changeset viewer.