X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fcurses.priv.h;h=58c0ea8de33fce0e333222d1b07cc0085469b5ac;hp=67a85920e268bbf4ece12953156338d3843f251e;hb=6b96eb711cbf58da43002ff14b66d8a52c19a731;hpb=ab61bfec8cb0c26638ea53ceadcd17048ee02996 diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index 67a85920..58c0ea8d 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -34,7 +34,7 @@ ****************************************************************************/ /* - * $Id: curses.priv.h,v 1.537 2014/05/03 21:20:12 tom Exp $ + * $Id: curses.priv.h,v 1.538 2014/07/12 20:06:11 tom Exp $ * * curses.priv.h * @@ -1458,11 +1458,11 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; AttrOf(dst) |= (attr_t) (ext + 1) #define if_WIDEC(code) code -#define Charable(ch) ((SP_PARM->_legacy_coding) \ +#define Charable(ch) (((SP_PARM->_legacy_coding) \ || (AttrOf(ch) & A_ALTCHARSET) \ - || (!isWidecExt(ch) && \ + || (!isWidecExt(ch))) && \ (ch).chars[1] == L'\0' && \ - _nc_is_charable(CharOf(ch)))) + _nc_is_charable(CharOf(ch))) #define L(ch) L ## ch #else /* }{ */