ncurses 5.9 - patch 20140823

[ncurses.git] / ncurses / tty / lib_vidattr.c

diff --git a/ncurses/tty/lib_vidattr.c b/ncurses/tty/lib_vidattr.c
index 0846d8485f423b0cfb8d5ad0ccb95aeffce34acf..77d31124b92f227b4bb7e07450dd9a2d97b3d227 100644 (file)
--- a/ncurses/tty/lib_vidattr.c
+++ b/ncurses/tty/lib_vidattr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2011,2013 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2014 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            *


@@ -69,7 +69,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
 #define CUR SP_TERMTYPE
 #endif
 

-MODULE_ID("$Id: lib_vidattr.c,v 1.67 2013/08/31 20:08:59 tom Exp $")
+MODULE_ID("$Id: lib_vidattr.c,v 1.70 2014/06/07 22:21:14 tom Exp $")

 
 #define doPut(mode) \
        TPUTS_TRACE(#mode); \
 
 #define doPut(mode) \
        TPUTS_TRACE(#mode); \


@@ -214,6 +214,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
 
     turn_off = (~newmode & PreviousAttr) & ALL_BUT_COLOR;
     turn_on = (newmode & ~PreviousAttr) & ALL_BUT_COLOR;
 
     turn_off = (~newmode & PreviousAttr) & ALL_BUT_COLOR;
     turn_on = (newmode & ~PreviousAttr) & ALL_BUT_COLOR;

+    turn_on = (newmode & ~(PreviousAttr & TPARM_ATTR)) & ALL_BUT_COLOR;

 
     SetColorsIf(((pair == 0) && !fix_pair0), PreviousAttr);
 
 
     SetColorsIf(((pair == 0) && !fix_pair0), PreviousAttr);
 


@@ -368,7 +369,7 @@ NCURSES_SP_NAME(termattrs) (NCURSES_SP_DCL0)
 
     if (HasTerminal(SP_PARM)) {
 #ifdef USE_TERM_DRIVER
 
     if (HasTerminal(SP_PARM)) {
 #ifdef USE_TERM_DRIVER

-       attrs = CallDriver(SP_PARM, conattr);
+       attrs = CallDriver(SP_PARM, td_conattr);

 #else /* ! USE_TERM_DRIVER */
 
        if (enter_alt_charset_mode)
 #else /* ! USE_TERM_DRIVER */
 
        if (enter_alt_charset_mode)