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

in display_string(), properly display double-column characters if 

they're past the first virtual page and their first column is covered by
the "$" displayed at the beginning of the line


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3528 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2006-05-19 17:50:01 +00:00
parent b9446ac429
commit d99b0e1cf3
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -237,6 +237,10 @@ CVS code -
- Add Ctrl-/ as an alias for Ctrl-_. (DLR, found by Benno - Add Ctrl-/ as an alias for Ctrl-_. (DLR, found by Benno
Schulenberg) Schulenberg)
- Simplify the if blocks wherever possible. (DLR) - Simplify the if blocks wherever possible. (DLR)
display_string()
- Properly display double-column characters if they're past the
first virtual page and their first column is covered by the
"$" displayed at the beginning of the line. (DLR)
edit_draw() edit_draw()
- Properly ignore zero-length regexes in multi-line regexes as - Properly ignore zero-length regexes in multi-line regexes as
well as single-line ones. This avoids a segfault when trying well as single-line ones. This avoids a segfault when trying

7
src/winio.c
View File

@ -1810,7 +1810,12 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
} }
} }
#ifdef ENABLE_UTF8 #ifdef ENABLE_UTF8
else if (using_utf8() && mbwidth(buf_mb) > 1) { else if (using_utf8() && mbwidth(buf_mb) == 2) {
if (column >= start_col) {
converted[index++] = ' ';
start_col++;
}
converted[index++] = ' '; converted[index++] = ' ';
start_col++; start_col++;