X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Ftinfo_driver.c;h=0a463082667d7e544a13d8076e1c135a132f924b;hp=5f2051b5b2eec7c119496745fe91e0c4b281d2bb;hb=4b1ec76cb0a0fa5055909f534b3f928dafc7f7f1;hpb=938680fa3bc29d2a086031a2f648dfd6cadcb51e diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c index 5f2051b5..0a463082 100644 --- a/ncurses/tinfo/tinfo_driver.c +++ b/ncurses/tinfo/tinfo_driver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2008-2011,2012 Free Software Foundation, Inc. * + * Copyright (c) 2008-2012,2013 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 * @@ -50,7 +50,7 @@ # endif #endif -MODULE_ID("$Id: tinfo_driver.c,v 1.25 2012/12/22 21:44:10 tom Exp $") +MODULE_ID("$Id: tinfo_driver.c,v 1.26 2013/01/05 23:25:36 tom Exp $") /* * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, @@ -1150,8 +1150,7 @@ _nc_cookie_init(SCREEN *sp) /* initialize normal acs before wide, since we use mapping in the latter */ #if !USE_WIDEC_SUPPORT - sp->_screen_unicode = _nc_unicode_locale(); - if (sp->screen_unicode && _nc_locale_breaks_acs(sp->_term)) { + if (_nc_unicode_locale() && _nc_locale_breaks_acs(sp->_term)) { acs_chars = NULL; ena_acs = NULL; enter_alt_charset_mode = NULL;