ncurses 5.9 - patch 20150328

[ncurses.git] / ncurses / base / lib_addch.c

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index 622cf11cacf115e8185d0cb8645df1ed8493b616..4b16a476c90aad7cb9b40cc844b6085a3ead1481 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.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            *
@@ -36,7 +36,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_addch.c,v 1.126 2013/03/02 21:06:47 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.129 2014/08/16 20:41:04 tom Exp $")
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
@@ -427,11 +427,11 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
               s[1] == 0
        )
        || (
-              (isprint(t) && !iscntrl(t))
+              (isprint((int)t) && !iscntrl((int)t))
 #if USE_WIDEC_SUPPORT
               || ((sp == 0 || !sp->_legacy_coding) &&
                   (WINDOW_EXT(win, addch_used)
-                   || !_nc_is_charable(t)))
+                   || !_nc_is_charable(CharOf(ch))))
 #endif
        )) {
        return waddch_literal(win, ch);
@@ -501,7 +501,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
     default:
        while (*s) {
            NCURSES_CH_T sch;
-           SetChar(sch, *s++, AttrOf(ch));
+           SetChar(sch, UChar(*s++), AttrOf(ch));
            if_EXT_COLORS(SetPair(sch, GetPair(ch)));
            if (waddch_literal(win, sch) == ERR)
                return ERR;