From eb5c49d5bce3c0a42d620acbe0f697fe9d28f882 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 19 May 2014 20:44:24 +0000 Subject: [PATCH] Painting the current line *after* tickling the terminal, so that the character in the final column will be displayed properly. Bug was introduced five days ago. Patch by Mark Majeres. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4905 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 5 +++++ src/winio.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 834578c2..db1151a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-05-19 Mark Majeres + * src/winio.c (edit_draw): Paint the current line *after* tickling the + terminal, so that the character in the final column will be displayed + properly. Bug was introduced five days ago. + 2014-05-18 Benno Schulenberg * src/nano (precalc_multicolorinfo): Do not match the ^ anchor when looking further on in a line. This prevents an end="^$" from being diff --git a/src/winio.c b/src/winio.c index dbf03ba7..002b71cc 100644 --- a/src/winio.c +++ b/src/winio.c @@ -2492,15 +2492,15 @@ void edit_draw(filestruct *fileptr, const char *converted, int assert(openfile != NULL && fileptr != NULL && converted != NULL); assert(strlenpt(converted) <= COLS); - /* Just paint the string in any case (we'll add color or reverse on - * just the text that needs it). */ - mvwaddstr(edit, line, 0, converted); #ifdef ENABLE_UTF8 if (using_utf8()) /* Tickle the terminal into displaying two-column characters * properly, using Unicode 00A0 (No-Break Space). */ mvwaddstr(edit, line, COLS - 1, "\xC2\xA0\x00"); #endif + /* First simply paint the line -- then we'll add colors or the + * marking highlight on just the pieces that need it. */ + mvwaddstr(edit, line, 0, converted); #ifndef DISABLE_COLOR /* If color syntaxes are available and turned on, we need to display -- 2.39.5