ncurses 5.6 - patch 20080927

+ fix build for --with-dmalloc by workaround for redefinition of
  strndup between string.h and dmalloc.h
+ fix build for --disable-sigwinch
+ add environment variable NCURSES_GPM_TERMS to allow override to use
  GPM on terminals other than "linux", etc.
+ disable GPM mouse support when $TERM does not happen to contain
  "linux", since Gpm_Open() no longer limits its assertion to terminals
  that it might handle, e.g., within "screen" in xterm.
+ reset mouse file-descriptor when unloading GPM library (report by
  Miroslav Lichvar).
+ fix build for --disable-leaks --enable-widec --with-termlib
> patch by Juergen Pfeifer:
+ use improved initialization for soft-label keys in Ada95 sample code.
+ discard internal symbol _nc_slk_format (unused since 20080112).
+ move call of slk_paint_info() from _nc_slk_initialize() to
  slk_intern_refresh(), improving initialization.

diff --git a/Ada95/samples/sample.adb b/Ada95/samples/sample.adb
index 5034e6cdc4546dc2d1c6b29b16d97f7e708e723e..648036f74a0bc017a477e28660984ec114942885 100644 (file)
--- a/Ada95/samples/sample.adb
+++ b/Ada95/samples/sample.adb
@@ -35,8 +35,8 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control

---  $Revision: 1.16 $
---  $Date: 2008/07/26 18:48:46 $
+--  $Revision: 1.17 $
+--  $Date: 2008/09/27 14:42:40 $

 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Text_IO;
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Text_IO;


@@ -191,7 +191,7 @@ package body Sample is
 
          Set_Soft_Label_Key_Attributes (Color => Header_Color);
          --  This propagates the attributes to the label window
 
          Set_Soft_Label_Key_Attributes (Color => Header_Color);
          --  This propagates the attributes to the label window

-         Clear_Soft_Label_Keys; Restore_Soft_Label_Keys;
+         Refresh_Soft_Label_Keys;

       end if;
 
       Init_Keyboard_Handler;
       end if;
 
       Init_Keyboard_Handler;

diff --git a/INSTALL b/INSTALL
index e338dc73d1853a487808aaa37778e7877c91734b..0571e98d261ede7dcfd49c201ddc4984669f07a5 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: INSTALL,v 1.129 2008/08/23 20:02:46 tom Exp $
+-- $Id: INSTALL,v 1.130 2008/09/27 22:04:56 tom Exp $

 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------


@@ -605,6 +605,9 @@ SUMMARY OF CONFIGURE OPTIONS:
        Normally this is the same as the release version; some ports have
        special requirements for compatibility.
 
        Normally this is the same as the release version; some ports have
        special requirements for compatibility.
 

+       This option does not affect linking with libtool, which uses the
+       release major/minor numbers.
+

     --with-ada-compiler=CMD
        Specify the Ada95 compiler command (default "gnatmake")
 
     --with-ada-compiler=CMD
        Specify the Ada95 compiler command (default "gnatmake")
 

diff --git a/NEWS b/NEWS
index c9b0e427afcfc8e16638203f1997b7bb345416d8..a14e7ed95eabd4484c1dd1b65e11c228900d201d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.1297 2008/09/25 23:30:56 tom Exp $
+-- $Id: NEWS,v 1.1302 2008/09/27 22:37:50 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,24 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20080927
+       + fix build for --with-dmalloc by workaround for redefinition of
+         strndup between string.h and dmalloc.h
+       + fix build for --disable-sigwinch
+       + add environment variable NCURSES_GPM_TERMS to allow override to use
+         GPM on terminals other than "linux", etc.
+       + disable GPM mouse support when $TERM does not happen to contain
+         "linux", since Gpm_Open() no longer limits its assertion to terminals
+         that it might handle, e.g., within "screen" in xterm.
+       + reset mouse file-descriptor when unloading GPM library (report by
+         Miroslav Lichvar).
+       + fix build for --disable-leaks --enable-widec --with-termlib
+       > patch by Juergen Pfeifer:
+       + use improved initialization for soft-label keys in Ada95 sample code.
+       + discard internal symbol _nc_slk_format (unused since 20080112).
+       + move call of slk_paint_info() from _nc_slk_initialize() to
+         slk_intern_refresh(), improving initialization.
+

 20080925
        + fix bug in mouse code for GPM from 20080920 changes (reported in
          Debian #500103, also Miroslav Lichvar).
 20080925
        + fix bug in mouse code for GPM from 20080920 changes (reported in
          Debian #500103, also Miroslav Lichvar).

diff --git a/dist.mk b/dist.mk
index 9d30d2b4e7b874976554621a976c6f47230311bf..aefa45e9a4fca236aae5399d67b1ac0a8941f5ef 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.662 2008/09/25 20:12:43 tom Exp $
+# $Id: dist.mk,v 1.663 2008/09/27 12:10:38 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 6
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 6

-NCURSES_PATCH = 20080925
+NCURSES_PATCH = 20080927

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/include/nc_alloc.h b/include/nc_alloc.h
index 9b5751de8c1f6cbcc47a25d0f145ebc664333b84..f521bffe9f0a0303cc2928dbd070a7ac0d7ef06c 100644 (file)
--- a/include/nc_alloc.h
+++ b/include/nc_alloc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -27,9 +27,9 @@
  ****************************************************************************/
 
 /****************************************************************************
  ****************************************************************************/
 
 /****************************************************************************

- *  Author: Thomas E. Dickey <dickey@clark.net> 1996,1997                   *
+ *  Author: Thomas E. Dickey                    1996-on                     *

  ****************************************************************************/
  ****************************************************************************/

-/* $Id: nc_alloc.h,v 1.15 2007/02/03 18:40:23 tom Exp $ */
+/* $Id: nc_alloc.h,v 1.16 2008/09/27 22:30:33 tom Exp $ */

 
 #ifndef NC_ALLOC_included
 #define NC_ALLOC_included 1
 
 #ifndef NC_ALLOC_included
 #define NC_ALLOC_included 1


@@ -39,6 +39,8 @@ extern "C" {
 #endif
 
 #if HAVE_LIBDMALLOC
 #endif
 
 #if HAVE_LIBDMALLOC

+#include <string.h>
+#undef strndup         /* workaround for #define in GLIBC 2.7 */

 #include <dmalloc.h>    /* Gray Watson's library */
 #else
 #undef  HAVE_LIBDMALLOC
 #include <dmalloc.h>    /* Gray Watson's library */
 #else
 #undef  HAVE_LIBDMALLOC

diff --git a/man/ncurses.3x b/man/ncurses.3x
index ac3d049528c2e6fba61c9f2c130147636c0ce703..7e337f9d21b34b34640b9bd6383b1bc3890bcbd2 100644 (file)
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
 '\" t
 .\"***************************************************************************

-.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *

 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *


@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: ncurses.3x,v 1.89 2007/09/01 18:57:29 tom Exp $
+.\" $Id: ncurses.3x,v 1.90 2008/09/27 19:30:39 tom Exp $

 .hy 0
 .TH ncurses 3X ""
 .ds n 5
 .hy 0
 .TH ncurses 3X ""
 .ds n 5


@@ -830,6 +830,18 @@ about the colors, set this to "-1,-1".
 To make it green-on-black, set it to "2,0".
 Any positive value from zero to the terminfo \fBmax_colors\fR value is allowed.
 .TP 5
 To make it green-on-black, set it to "2,0".
 Any positive value from zero to the terminfo \fBmax_colors\fR value is allowed.
 .TP 5

+NCURSES_GPM_TERMS
+This applies only to ncurses configured to use the GPM interface.
+.IP
+If present,
+the environment variable is a list of one or more terminal names
+against which the TERM environment variable is matched.
+Setting it to an empty value disables the GPM interface;
+using the built-in support for xterm, etc.
+.IP
+If the environment variable is absent,
+ncurses will attempt to open GPM if TERM contains "linux".
+.TP 5

 NCURSES_NO_HARD_TABS
 \fBNcurses\fP may use tabs as part of the cursor movement optimization.
 In some cases,
 NCURSES_NO_HARD_TABS
 \fBNcurses\fP may use tabs as part of the cursor movement optimization.
 In some cases,

diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index e3625a2ffe2a414e3fd7786ec6e40eb8529d299e..5640265829111e054ec44cf66fcda3397babe591 100644 (file)
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -40,7 +40,7 @@
 extern int malloc_errfd;       /* FIXME */
 #endif
 
 extern int malloc_errfd;       /* FIXME */
 #endif
 

-MODULE_ID("$Id: lib_freeall.c,v 1.53 2008/09/20 18:28:51 tom Exp $")
+MODULE_ID("$Id: lib_freeall.c,v 1.54 2008/09/27 13:09:57 tom Exp $")

 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical
 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical


@@ -105,7 +105,9 @@ _nc_freeall(void)
 #ifdef TRACE
     (void) _nc_trace_buf(-1, 0);
 #endif
 #ifdef TRACE
     (void) _nc_trace_buf(-1, 0);
 #endif

-
+#if USE_WIDEC_SUPPORT
+    FreeIfNeeded(_nc_wacs);
+#endif

     _nc_leaks_tinfo();
 
 #if HAVE_LIBDBMALLOC
     _nc_leaks_tinfo();
 
 #if HAVE_LIBDBMALLOC

diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index 731025e30d3a12666ea06cc6888202c4b32bb18e..16fc0da9056c5216af1b10d1180794497d843eda 100644 (file)
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -79,7 +79,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_mouse.c,v 1.99 2008/09/25 21:47:51 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.101 2008/09/27 19:14:52 tom Exp $")

 
 #include <term.h>
 #include <tic.h>
 
 #include <term.h>
 #include <tic.h>


@@ -365,20 +365,33 @@ enable_xterm_mouse(SCREEN *sp, int enable)
 }
 
 #if USE_GPM_SUPPORT
 }
 
 #if USE_GPM_SUPPORT

-static int
+static bool

 allow_gpm_mouse(void)
 {
 allow_gpm_mouse(void)
 {

+    bool result = FALSE;
+

     /* GPM does printf's without checking if stdout is a terminal */
     if (isatty(fileno(stdout))) {
     /* GPM does printf's without checking if stdout is a terminal */
     if (isatty(fileno(stdout))) {

+       char *list = getenv("NCURSES_GPM_TERMS");

        char *env = getenv("TERM");
        char *env = getenv("TERM");

-       /* GPM checks the beginning of the $TERM variable to decide if
-        * it should pass xterm events through.  There is no real advantage
-        * in allowing GPM to do this.
-        */
-       if (env == 0 || strncmp(env, "xterm", 5))
-           return TRUE;
+       if (list != 0) {
+           if (env != 0) {
+               result = _nc_name_match(list, env, "|:");
+           }
+       } else {
+           /* GPM checks the beginning of the $TERM variable to decide if it
+            * should pass xterm events through.  There is no real advantage in
+            * allowing GPM to do this.  Recent versions relax that check, and
+            * pretend that GPM can work with any terminal having the kmous
+            * capability.  Perhaps that works for someone.  If so, they can
+            * set the environment variable (above).
+            */
+           if (env != 0 && strstr(env, "linux") != 0) {
+               result = TRUE;
+           }
+       }

     }
     }

-    return FALSE;
+    return result;

 }
 
 #ifdef HAVE_LIBDL
 }
 
 #ifdef HAVE_LIBDL


@@ -388,6 +401,7 @@ unload_gpm_library(SCREEN *sp)
     if (SP->_dlopen_gpm != 0) {
        T(("unload GPM library"));
        sp->_mouse_gpm_loaded = FALSE;
     if (SP->_dlopen_gpm != 0) {
        T(("unload GPM library"));
        sp->_mouse_gpm_loaded = FALSE;

+       sp->_mouse_fd = -1;

        dlclose(sp->_dlopen_gpm);
        sp->_dlopen_gpm = 0;
     }
        dlclose(sp->_dlopen_gpm);
        sp->_dlopen_gpm = 0;
     }

diff --git a/ncurses/base/lib_slk.c b/ncurses/base/lib_slk.c
index fd5c53e07fc4536f6dd8cf50bb06bbf7791a0a10..662f7e45b11661cbe516484f567e0872a797f2e4 100644 (file)
--- a/ncurses/base/lib_slk.c
+++ b/ncurses/base/lib_slk.c
@@ -45,34 +45,7 @@
 #include <ctype.h>
 #include <term.h>              /* num_labels, label_*, plab_norm */
 
 #include <ctype.h>
 #include <term.h>              /* num_labels, label_*, plab_norm */
 

-MODULE_ID("$Id: lib_slk.c,v 1.34 2008/08/16 19:20:04 tom Exp $")
-
-/*
- * We'd like to move these into the screen context structure, but cannot,
- * because slk_init() is called before initscr()/newterm().
- */
-NCURSES_EXPORT_VAR(int)
-_nc_slk_format = 0;            /* one more than format specified in slk_init() */
-
-/*
- * Paint the info line for the PC style SLK emulation.
- */
-static void
-slk_paint_info(WINDOW *win)
-{
-    SCREEN *sp = _nc_screen_of(win);
-
-    if (win && sp && (sp->slk_format == 4)) {
-       int i;
-
-       mvwhline(win, 0, 0, 0, getmaxx(win));
-       wmove(win, 0, 0);
-
-       for (i = 0; i < sp->_slk->maxlab; i++) {
-           mvwprintw(win, 0, sp->_slk->ent[i].ent_x, "F%d", i + 1);
-       }
-    }
-}
+MODULE_ID("$Id: lib_slk.c,v 1.35 2008/09/27 14:07:33 juergen Exp $")

 
 /*
  * Free any memory related to soft labels, return an error.
 
 /*
  * Free any memory related to soft labels, return an error.


@@ -160,7 +133,6 @@ _nc_slk_initialize(WINDOW *stwin, int cols)
            x += max_length;
            x += (i == 3 || i == 7) ? gap : 1;
        }
            x += max_length;
            x += (i == 3 || i == 7) ? gap : 1;
        }

-       slk_paint_info(stwin);

     } else {
        if (_nc_globals.slk_format == 2) {      /* 4-4 */
            int gap = cols - (SP->_slk->maxlab * max_length) - 6;
     } else {
        if (_nc_globals.slk_format == 2) {      /* 4-4 */
            int gap = cols - (SP->_slk->maxlab * max_length) - 6;


@@ -214,8 +186,6 @@ slk_restore(void)
        return (ERR);
     SP->_slk->hidden = FALSE;
     SP->_slk->dirty = TRUE;
        return (ERR);
     SP->_slk->hidden = FALSE;
     SP->_slk->dirty = TRUE;

-    /* we have to repaint info line eventually */
-    slk_paint_info(SP->_slk->win);

 
     returnCode(slk_refresh());
 }
 
     returnCode(slk_refresh());
 }

diff --git a/ncurses/base/lib_slkrefr.c b/ncurses/base/lib_slkrefr.c
index 20a2198e2d74f4f190956dac7c0572b0bf23c519..cb1beba0e2a1c7ad15fc56e7bf2f3d7a7b3335cd 100644 (file)
--- a/ncurses/base/lib_slkrefr.c
+++ b/ncurses/base/lib_slkrefr.c
@@ -40,7 +40,27 @@
 #include <curses.priv.h>
 #include <term.h>              /* num_labels, label_*, plab_norm */
 
 #include <curses.priv.h>
 #include <term.h>              /* num_labels, label_*, plab_norm */
 

-MODULE_ID("$Id: lib_slkrefr.c,v 1.16 2008/08/03 22:40:27 tom Exp $")
+MODULE_ID("$Id: lib_slkrefr.c,v 1.17 2008/09/27 14:07:53 juergen Exp $")
+
+/*
+ * Paint the info line for the PC style SLK emulation.
+ */
+static void
+slk_paint_info(WINDOW *win)
+{
+    SCREEN *sp = _nc_screen_of(win);
+
+    if (win && sp && (sp->slk_format == 4)) {
+       int i;
+
+       mvwhline(win, 0, 0, 0, getmaxx(win));
+       wmove(win, 0, 0);
+
+       for (i = 0; i < sp->_slk->maxlab; i++) {
+           mvwprintw(win, 0, sp->_slk->ent[i].ent_x, "F%d", i + 1);
+       }
+    }
+}

 
 /*
  * Write the soft labels to the soft-key window.
 
 /*
  * Write the soft labels to the soft-key window.


@@ -60,6 +80,8 @@ slk_intern_refresh(SLK * slk)
                        putp(TPARM_2(plab_norm, i + 1, slk->ent[i].form_text));
                    }
                } else {
                        putp(TPARM_2(plab_norm, i + 1, slk->ent[i].form_text));
                    }
                } else {

+                   if (fmt == 4)
+                       slk_paint_info(slk->win);

                    wmove(slk->win, SLK_LINES(fmt) - 1, slk->ent[i].ent_x);
                    if (SP->_slk) {
                        wattrset(slk->win, AttrOf(SP->_slk->attr));
                    wmove(slk->win, SLK_LINES(fmt) - 1, slk->ent[i].ent_x);
                    if (SP->_slk) {
                        wattrset(slk->win, AttrOf(SP->_slk->attr));

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index a2e8fb2211c9463b9604291d951378374ceb0d13..5175dd7cd292c1fe85d1684c77832da8475ff002 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
 
 
 /*
 
 
 /*

- * $Id: curses.priv.h,v 1.392 2008/09/20 21:14:11 tom Exp $
+ * $Id: curses.priv.h,v 1.393 2008/09/27 22:12:07 tom Exp $

  *
  *     curses.priv.h
  *
  *
  *     curses.priv.h
  *


@@ -147,7 +147,7 @@ extern int errno;
 #define HAVE_SIZECHANGE 0
 #endif
 
 #define HAVE_SIZECHANGE 0
 #endif
 

-#if HAVE_SIZECHANGE && defined(SIGWINCH)
+#if HAVE_SIZECHANGE && USE_SIGWINCH && defined(SIGWINCH)

 #define USE_SIZECHANGE 1
 #else
 #define USE_SIZECHANGE 0
 #define USE_SIZECHANGE 1
 #else
 #define USE_SIZECHANGE 0

diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c
index 0a43a17f3e96cd38aa14256bd76b35b103a3cff6..cf2a8337b870ce931f67d670ed6259086fccd522 100644 (file)
--- a/ncurses/tinfo/entries.c
+++ b/ncurses/tinfo/entries.c
@@ -37,7 +37,7 @@
 #include <tic.h>
 #include <term_entry.h>
 
 #include <tic.h>
 #include <term_entry.h>
 

-MODULE_ID("$Id: entries.c,v 1.7 2008/06/28 23:08:51 tom Exp $")
+MODULE_ID("$Id: entries.c,v 1.8 2008/09/27 13:11:10 tom Exp $")

 
 /****************************************************************************
  *
 
 /****************************************************************************
  *


@@ -128,9 +128,6 @@ _nc_leaks_tinfo(void)
     _nc_codes_leaks();
     FreeIfNeeded(_nc_prescreen.real_acs_map);
 #endif
     _nc_codes_leaks();
     FreeIfNeeded(_nc_prescreen.real_acs_map);
 #endif

-#if USE_WIDEC_SUPPORT
-    FreeIfNeeded(_nc_wacs);
-#endif

 
     if ((s = _nc_home_terminfo()) != 0)
        free(s);
 
     if ((s = _nc_home_terminfo()) != 0)
        free(s);

diff --git a/panel/panel.priv.h b/panel/panel.priv.h
index 98d741ff6ef014be605012dd793a97467dd4a8dc..4fb8144e1b7732c3f5ed20cb2c2a58cefb0b8aa3 100644 (file)
--- a/panel/panel.priv.h
+++ b/panel/panel.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2001,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 
  * authorization.                                                           *
  ****************************************************************************/
 

-/* $Id: panel.priv.h,v 1.21 2005/11/26 15:27:00 tom Exp $ */
+/* $Id: panel.priv.h,v 1.22 2008/09/27 22:36:11 tom Exp $ */

 
 #ifndef NCURSES_PANEL_PRIV_H
 #define NCURSES_PANEL_PRIV_H 1
 
 #ifndef NCURSES_PANEL_PRIV_H
 #define NCURSES_PANEL_PRIV_H 1


@@ -39,14 +39,6 @@
 #include <string.h>
 #include <assert.h>
 
 #include <string.h>
 #include <assert.h>
 

-#if HAVE_LIBDMALLOC
-#  include <dmalloc.h>    /* Gray Watson's library */
-#endif
-
-#if HAVE_LIBDBMALLOC
-#  include <dbmalloc.h>   /* Conor Cahill's library */
-#endif
-

 #include "curses.priv.h"
 #include "panel.h"
 #include <nc_panel.h>
 #include "curses.priv.h"
 #include "panel.h"
 #include <nc_panel.h>

diff --git a/test/ncurses.c b/test/ncurses.c
index f1bab0e2ba616318c5d02bbaa8764b9b38c9671c..3fd7dfae705b07c06f4dac383f55e09da374b94b 100644 (file)
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -40,7 +40,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 

-$Id: ncurses.c,v 1.328 2008/09/13 18:56:02 tom Exp $
+$Id: ncurses.c,v 1.329 2008/09/27 14:34:58 tom Exp $

 
 ***************************************************************************/
 
 
 ***************************************************************************/
 


@@ -2513,7 +2513,7 @@ slk_help(void)
 #if HAVE_SLK_COLOR
        ,"F/B        -- cycle through foreground/background colors"
 #endif
 #if HAVE_SLK_COLOR
        ,"F/B        -- cycle through foreground/background colors"
 #endif

-       ,"ESC  -- return to main menu"
+       ,"ESC        -- return to main menu"

        ,""
        ,"Note: if activating the soft keys causes your terminal to scroll up"
        ,"one line, your terminal auto-scrolls when anything is written to the"
        ,""
        ,"Note: if activating the soft keys causes your terminal to scroll up"
        ,"one line, your terminal auto-scrolls when anything is written to the"