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
master
David Lawrence Ramsey 2004-07-27 15:46:58 +00:00
parent 1536f8613d
commit ad1fd0d968
2 changed files with 4 additions and 1 deletions

View File

@ -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)

View File

@ -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