From 25af9dc9697fef5854984415d402e54121acb1cb Mon Sep 17 00:00:00 2001 From: corvid Date: Sun, 23 Oct 2011 01:29:40 +0000 Subject: back out c6cbf3ae7ffd (LC_CTYPE) I'd asked furaisanjin about input methods, and it sounded like it would be okay, but it turns out that something goes wrong on his system after all (LANG and the various LC_* set to ja_JP.eucJP normally, "while converting to Kanji, font width is half and it's not easy to recognize.") So I can't get away with the lazy fix after all. --- dw/findtext.cc | 4 ---- src/dillo.cc | 10 ---------- 2 files changed, 14 deletions(-) diff --git a/dw/findtext.cc b/dw/findtext.cc index e7cd3597..9793db91 100644 --- a/dw/findtext.cc +++ b/dw/findtext.cc @@ -216,10 +216,6 @@ bool FindtextState::unhighlight () return false; } -/** \todo If this is made UTF8-aware one day, we might want to - * setlocale(LC_CTYPE, "") for the duration of the search. See the comment in - * main() for why we normally keep it set to "C". - */ bool FindtextState::search0 (bool backwards, bool firstTrial) { if (iterator->getChar () == CharIterator::END) diff --git a/src/dillo.cc b/src/dillo.cc index 8c720e5a..b05cb16a 100644 --- a/src/dillo.cc +++ b/src/dillo.cc @@ -321,16 +321,6 @@ int main(int argc, char **argv) } dFree(opt_argv); - - /* On X, the first fl_open_display() sets the LC_CTYPE aspect of the locale - * from the environment, so let's trigger it ourselves so that we can - * deal with this. For our purposes, this is very bad in Turkic locales - * where 'i' and 'I' are different letters, and strcasecmp(), toupper(), - * tolower() no longer work as expected. So we reset it to the C locale. - */ - fl_open_display(); - setlocale(LC_CTYPE, "C"); - // set the default values for the preferences a_Prefs_init(); -- cgit v1.2.3