6 files changed, 24 insertions, 18 deletions
diff --git a/lib/libcurses/base/lib_color.c b/lib/libcurses/base/lib_color.c
index 8ed06319de7..dceb1e8f215 100644
--- a/lib/libcurses/base/lib_color.c
+++ b/lib/libcurses/base/lib_color.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lib_color.c,v 1.2 1999/03/02 06:23:27 millert Exp $	*/
+/*	$OpenBSD: lib_color.c,v 1.3 1999/03/15 19:12:22 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -43,7 +43,7 @@
 
 #include <term.h>
 
-MODULE_ID("$From: lib_color.c,v 1.34 1999/02/27 19:54:51 tom Exp $")
+MODULE_ID("$From: lib_color.c,v 1.35 1999/03/15 01:45:14 Alexander.V.Lukyanov Exp $")
 
 /*
  * These should be screen structure members.  They need to be globals for
@@ -260,7 +260,9 @@ int init_pair(short pair, short f, short b)
 		bool changed = FALSE;
 		for (x = 0; x <= curscr->_maxx; x++) {
 		    if ((ptr->text[x] & A_COLOR) == z) {
-			ptr->text[x] &= ~A_COLOR;
+			/* Set the old cell to zero to ensure it will be
+			   updated on the next doupdate() */
+			ptr->text[x] = 0;
 			CHANGED_CELL(ptr,x);
 			changed = TRUE;
 		    }
diff --git a/lib/libcurses/curses.h b/lib/libcurses/curses.h
index e799fe37bcc..3ab4fde0492 100644
--- a/lib/libcurses/curses.h
+++ b/lib/libcurses/curses.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: curses.h,v 1.24 1999/03/14 03:14:19 millert Exp $	*/
+/*	$OpenBSD: curses.h,v 1.25 1999/03/15 19:12:19 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -50,7 +50,7 @@
 /* These are defined only in curses.h, and are used for conditional compiles */
 #define NCURSES_VERSION_MAJOR 5
 #define NCURSES_VERSION_MINOR 0
-#define NCURSES_VERSION_PATCH 990313
+#define NCURSES_VERSION_PATCH 990314
 
 /* This is defined in more than one ncurses header, for identification */
 #undef  NCURSES_VERSION
diff --git a/lib/libcurses/curses.priv.h b/lib/libcurses/curses.priv.h
index 8ed5a48153a..09c2eb733e1 100644
--- a/lib/libcurses/curses.priv.h
+++ b/lib/libcurses/curses.priv.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: curses.priv.h,v 1.15 1999/03/12 04:36:02 millert Exp $	*/
+/*	$OpenBSD: curses.priv.h,v 1.16 1999/03/15 19:12:21 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -35,7 +35,7 @@
 
 
 /*
- * $From: curses.priv.h,v 1.137 1999/03/03 23:43:39 juergen Exp $
+ * $From: curses.priv.h,v 1.138 1999/03/14 12:25:18 tom Exp $
  *
  *	curses.priv.h
  *
@@ -633,7 +633,7 @@ extern void _nc_expanded(void);
 extern void *_nc_doalloc(void *, size_t);
 #if !HAVE_STRDUP
 #define strdup _nc_strdup
-extern char *_nc_strdup(char *);
+extern char *_nc_strdup(const char *);
 #endif
 
 /* doupdate.c */
diff --git a/lib/libcurses/tinfo/comp_hash.c b/lib/libcurses/tinfo/comp_hash.c
index 95d9caf0e56..862dd21fb3e 100644
--- a/lib/libcurses/tinfo/comp_hash.c
+++ b/lib/libcurses/tinfo/comp_hash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: comp_hash.c,v 1.2 1999/03/02 06:23:28 millert Exp $	*/
+/*	$OpenBSD: comp_hash.c,v 1.3 1999/03/15 19:12:22 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -51,7 +51,7 @@
 #define DEBUG(level, params) /*nothing*/
 #endif
 
-MODULE_ID("$From: comp_hash.c,v 1.19 1999/02/22 22:49:43 tom Exp $")
+MODULE_ID("$From: comp_hash.c,v 1.20 1999/03/14 12:23:26 tom Exp $")
 
 static  int hash_function(const char *);
 
@@ -65,6 +65,10 @@ static  int hash_function(const char *);
  */
 
 #ifdef MAIN_PROGRAM
+
+#undef USE_RCS_IDS
+#include <tinfo/doalloc.c>
+
 static void _nc_make_hash_table(struct name_table_entry *table,
 		     struct name_table_entry **hash_table)
 {
diff --git a/lib/libcurses/tinfo/doalloc.c b/lib/libcurses/tinfo/doalloc.c
index 43b6017e35c..8a87ead7f15 100644
--- a/lib/libcurses/tinfo/doalloc.c
+++ b/lib/libcurses/tinfo/doalloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: doalloc.c,v 1.2 1999/03/02 06:23:28 millert Exp $	*/
+/*	$OpenBSD: doalloc.c,v 1.3 1999/03/15 19:12:23 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$From: doalloc.c,v 1.4 1999/02/27 19:58:33 tom Exp $")
+MODULE_ID("$From: doalloc.c,v 1.5 1999/03/14 12:25:27 tom Exp $")
 
 void *_nc_doalloc(void *oldp, size_t amount)
 {
@@ -60,13 +60,13 @@ void *_nc_doalloc(void *oldp, size_t amount)
 }
 
 #if !HAVE_STRDUP
-char *_nc_strdup(char *src)
+char *_nc_strdup(const char *src)
 {
     char *dst;
     if (src != 0) {
-	char *dst = typeMalloc(char, strlen(src) + 1);
+	*dst = typeMalloc(char, strlen(src) + 1);
 	if (dst != 0) {
-	    (void)strcpy(dst, src):
+	    (void)strcpy(dst, src);
 	}
     } else {
 	dst = 0;
diff --git a/lib/libcurses/trace/lib_tracebits.c b/lib/libcurses/trace/lib_tracebits.c
index b7038c6793b..c9363e7445f 100644
--- a/lib/libcurses/trace/lib_tracebits.c
+++ b/lib/libcurses/trace/lib_tracebits.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lib_tracebits.c,v 1.1 1999/01/18 19:10:24 millert Exp $	*/
+/*	$OpenBSD: lib_tracebits.c,v 1.2 1999/03/15 19:12:23 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -36,7 +36,7 @@
 #include <curses.priv.h>
 #include <term.h>	/* cur_term */
 
-MODULE_ID("$From: lib_tracebits.c,v 1.1 1998/11/08 00:20:32 tom Exp $")
+MODULE_ID("$From: lib_tracebits.c,v 1.2 1999/03/14 12:27:03 tom Exp $")
 
 #if defined(SVR4_TERMIO) && !defined(_POSIX_SOURCE)
 #define _POSIX_SOURCE
@@ -215,5 +215,5 @@ cflags[] =
     return(buf);
 }
 #else
-char *_nc_tracebits(void) { return ""; }
+char *_nc_tracebits(void) { static char tmp[] = ""; return tmp; }
 #endif /* TRACE */