X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_color.c;h=8ae26a0a4c28d14782e302d8112a009badaa42d8;hp=1322600c340054d288ad9f3e2bfb0c2ed7040267;hb=e3d8d5a5a9425b40e09df86a597c3e971dced9d1;hpb=ef2d99350e0d3e4606171b5b1466ab92ec440205

diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c
index 1322600c..8ae26a0a 100644
--- a/ncurses/base/lib_color.c
+++ b/ncurses/base/lib_color.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2014,2015 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            *
@@ -45,7 +45,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_color.c,v 1.110 2014/03/08 20:04:44 tom Exp $")
+MODULE_ID("$Id: lib_color.c,v 1.112 2015/10/17 20:39:18 Denis.Tikhomirov Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define CanChange      InfoOf(SP_PARM).canchange
@@ -544,7 +544,7 @@ NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx
 
     SP_PARM->_color_pairs[pair] = result;
     if (GET_SCREEN_PAIR(SP_PARM) == pair)
-	SET_SCREEN_PAIR(SP_PARM, (chtype) (~0));	/* force attribute update */
+	SET_SCREEN_PAIR(SP_PARM, (int) (~0));	/* force attribute update */
 
 #ifdef USE_TERM_DRIVER
     CallDriver_3(SP_PARM, td_initpair, pair, f, b);
@@ -858,8 +858,6 @@ NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx
 	}
     } else {
 	reset_color_pair(NCURSES_SP_ARG);
-	if (old_pair < 0)
-	    return;
     }
 
 #if NCURSES_EXT_FUNCS