From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Tue, 27 Jul 2004 15:46:58 +0000 (+0000)
Subject: per Junichi Uekawa's patch in Debian's version of nano, call setlocale()
X-Git-Tag: v1.3.4~41
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=ad1fd0d96814b50f2baee50e9aa4acace3d29a66;p=nano.git

per Junichi Uekawa's patch in Debian's version of nano, call setlocale()
outside the ENABLE_NLS #ifdef, since UTF-8 support (specifically, the
wide character handling functions it needs) won't work properly if the
locale isn't set, whether NLS is enabled or not


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1865 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index 69e4d9ba..8307b795 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,6 +88,9 @@ CVS code -
 	- Move the reset_cursor() call to the beginning of the main
 	  input loop, and remove the apparently unnecessary wrefresh()
 	  call. (David Benbennick)
+	- Call setlocale() outside the ENABLE_NLS #ifdef, since UTF-8
+	  support won't work properly if the locale isn't set, whether
+	  NLS is enabled or not. (Junichi Uekawa)
 - nano.h:
 	- Reassign the key for full justification to Ctrl-U, for
 	  compatibility with the current version of Pico. (DLR)
diff --git a/src/nano.c b/src/nano.c
index f521ee27..66fa16b6 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -3094,8 +3094,8 @@ int main(int argc, char *argv[])
     };
 #endif
 
-#ifdef ENABLE_NLS
     setlocale(LC_ALL, "");
+#ifdef ENABLE_NLS
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
 #endif