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

in display_string(), don't check for multicolumn characters if the NO_UTF8 flag isn't set 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2624 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-06-10 20:45:54 +00:00
parent 44491acfef
commit d0d5b8fc0e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -175,6 +175,8 @@ CVS code -
display_string() display_string()
- Avoid a memory corruption problem by allocating enough space - Avoid a memory corruption problem by allocating enough space
for len plus a trailing multibyte character and/or tab. (DLR) for len plus a trailing multibyte character and/or tab. (DLR)
- Don't check for multicolumn characters if the NO_UTF8 flag
isn't set. (DLR)
nanogetstr() nanogetstr()
- Rename variable def to curranswer to avoid confusion. (DLR) - Rename variable def to curranswer to avoid confusion. (DLR)
- Only declare and use the tabbed variable if DISABLE_TABCOMP - Only declare and use the tabbed variable if DISABLE_TABCOMP

2
src/winio.c
View File

@ -2287,7 +2287,7 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
} }
} }
#ifdef NANO_WIDE #ifdef NANO_WIDE
else if (mbwidth(buf_mb) > 1) { else if (!ISSET(NO_UTF8) && mbwidth(buf_mb) > 1) {
converted[index++] = ' '; converted[index++] = ' ';
start_col++; start_col++;