unicode: check $LC_ALL to detect Unicode mode, not only $LANG

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2013-07-02 17:30:23 +02:00
parent ea267d518f
commit 3e7ecb179b
3 changed files with 18 additions and 6 deletions

View File

@@ -9657,7 +9657,11 @@ preadfd(void)
* _during_ shell execution, not only if it was set when
* shell was started. Therefore, re-check LANG every time:
*/
reinit_unicode(lookupvar("LANG"));
{
const char *s = lookupvar("LC_ALL");
if (!s) s = lookupvar("LANG");
reinit_unicode(s);
}
nr = read_line_input(line_input_state, cmdedit_prompt, buf, IBUFSIZ, timeout);
if (nr == 0) {
/* Ctrl+C pressed */