aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2013-10-13 03:32:33 +0000
committerTatsuya Kinoshita <tats@debian.org>2013-10-13 03:32:33 +0000
commit3b0f3b962eafd20ab30e8a265dcfb3f1f0257989 (patch)
tree1f6261a0608d9f8c080ac272cb2daee4442d0e64 /debian/patches
parentNew patch 220_maxcol.patch to bump MAXCOL to 256 (diff)
downloadw3m-3b0f3b962eafd20ab30e8a265dcfb3f1f0257989.tar.gz
w3m-3b0f3b962eafd20ab30e8a265dcfb3f1f0257989.zip
New patch 230_cygwin-lang.patch to fix upstream bug
Bug: https://sourceforge.net/p/w3m/patches/66/
Diffstat (limited to '')
-rw-r--r--debian/patches/230_cygwin-lang.patch30
-rw-r--r--debian/patches/series1
2 files changed, 31 insertions, 0 deletions
diff --git a/debian/patches/230_cygwin-lang.patch b/debian/patches/230_cygwin-lang.patch
new file mode 100644
index 0000000..c8c72c8
--- /dev/null
+++ b/debian/patches/230_cygwin-lang.patch
@@ -0,0 +1,30 @@
+Subject: Do not fail when LANG is not set on Cygwin
+From: Tatsuya Kinoshita <tats@debian.org>
+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
+--- a/terms.c
++++ b/terms.c
+@@ -222,6 +222,7 @@ static void
+ check_cygwin_console(void)
+ {
+ char *term = getenv("TERM");
++ char *ctype;
+ HANDLE hWnd;
+
+ if (term == NULL)
+@@ -236,7 +237,9 @@ check_cygwin_console(void)
+ isLocalConsole = 1;
+ }
+ }
+- if (strncmp(getenv("LANG"), "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
diff --git a/debian/patches/series b/debian/patches/series
index 30aa5e2..4c95a03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,4 +21,5 @@
200_readme-img-typo.patch
210_vim-like.patch
220_maxcol.patch
+230_cygwin-lang.patch
900_ChangeLog.patch