diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2013-10-14 00:38:25 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2013-10-14 00:38:25 +0000 |
| commit | 7535c508ef29fa9a0332606edcd77aa078bdc395 (patch) | |
| tree | 937768fa3f9491d2c4a8376eceaef0c145aadffa | |
| parent | Debian release 0.5.3-12 (diff) | |
| download | w3m-7535c508ef29fa9a0332606edcd77aa078bdc395.tar.gz w3m-7535c508ef29fa9a0332606edcd77aa078bdc395.zip | |
Update 230_cygwin-lang.patch to really fix
| -rw-r--r-- | debian/patches/230_cygwin-lang.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/230_cygwin-lang.patch b/debian/patches/230_cygwin-lang.patch index c8c72c8..5a6671e 100644 --- a/debian/patches/230_cygwin-lang.patch +++ b/debian/patches/230_cygwin-lang.patch @@ -1,12 +1,12 @@ Subject: Do not fail when LANG is not set on Cygwin -From: Tatsuya Kinoshita <tats@debian.org> +From: Tatsuya Kinoshita <tats@debian.org>, Jarek Czekalski <jarekczek@poczta.onet.pl> Bug: https://sourceforge.net/p/w3m/patches/66/ Check whether the value of LC_ALL, LC_CTYPE or LANG is not NULL in check_cygwin_console(). diff --git a/terms.c b/terms.c -index 7a3c987..4bb46c0 100644 +index 7a3c987..399d117 100644 --- a/terms.c +++ b/terms.c @@ -222,6 +222,7 @@ static void @@ -22,9 +22,9 @@ index 7a3c987..4bb46c0 100644 } } - if (strncmp(getenv("LANG"), "ja", 2) == 0) { -+ if ((ctype = getenv("LC_ALL") || -+ ctype = getenv("LC_CTYPE") || -+ ctype = getenv("LANG")) && strncmp(ctype, "ja", 2) == 0) { ++ if (((ctype = getenv("LC_ALL")) || ++ (ctype = getenv("LC_CTYPE")) || ++ (ctype = getenv("LANG"))) && strncmp(ctype, "ja", 2) == 0) { isWinConsole = TERM_CYGWIN_RESERVE_IME; } #ifdef SUPPORT_WIN9X_CONSOLE_MBCS |