ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

comment clarifications 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2380 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-03-16 16:40:21 +00:00
parent 40ea2a2ea0
commit ba5b12c1fa
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nano.c
View File

@ -3621,7 +3621,9 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
* input buffer if we're not. */ * input buffer if we're not. */
if (input != ERR && *s_or_t == FALSE && ( if (input != ERR && *s_or_t == FALSE && (
#ifdef NANO_WIDE #ifdef NANO_WIDE
/* Keep non-ASCII control characters in UTF-8 mode. */ /* Keep non-ASCII control characters if we're in UTF-8
* mode, since they might be part of a UTF-8
* sequence. */
(!ISSET(NO_UTF8) && !is_ascii_char(input)) || (!ISSET(NO_UTF8) && !is_ascii_char(input)) ||
#endif #endif
!is_cntrl_char(input))) { !is_cntrl_char(input))) {
@ -3949,8 +3951,8 @@ int main(int argc, char **argv)
#ifdef NANO_WIDE #ifdef NANO_WIDE
{ {
/* If the locale set doesn't exist, or it exists but doesn't /* If the locale set doesn't exist, or it exists but doesn't
* include the string "UTF-8", we shouldn't use UTF-8 * include the string "UTF-8", we shouldn't go into UTF-8
* support. */ * mode. */
char *locale = setlocale(LC_ALL, ""); char *locale = setlocale(LC_ALL, "");
if (locale == NULL || (locale != NULL && if (locale == NULL || (locale != NULL &&

4
src/winio.c
View File

@ -1682,7 +1682,9 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *s_or_t,
* input buffer if we're not. */ * input buffer if we're not. */
if (input != ERR && *s_or_t == FALSE && ( if (input != ERR && *s_or_t == FALSE && (
#ifdef NANO_WIDE #ifdef NANO_WIDE
/* Keep non-ASCII control characters in UTF-8 mode. */ /* Keep non-ASCII control characters if we're in UTF-8
* mode, since they might be part of a UTF-8
* sequence. */
(!ISSET(NO_UTF8) && !is_ascii_char(input)) || (!ISSET(NO_UTF8) && !is_ascii_char(input)) ||
#endif #endif
!is_cntrl_char(input))) { !is_cntrl_char(input))) {