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

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2624 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 161ab3fd885e39901a4a43763088ecb6fd80de0d..2eff8b04370e049acf8a830dc8e0c21a116940f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -175,6 +175,8 @@ CVS code -
   display_string()
        - Avoid a memory corruption problem by allocating enough space
          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()
        - Rename variable def to curranswer to avoid confusion. (DLR)
        - Only declare and use the tabbed variable if DISABLE_TABCOMP

diff --git a/src/winio.c b/src/winio.c
index 7bb7366f003dba3fca671f102c65cf6fb99a5b73..58b942996b1ad9601f7c1195e4e6f28d270a98d0 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -2287,7 +2287,7 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
            }
        }
 #ifdef NANO_WIDE
-       else if (mbwidth(buf_mb) > 1) {
+       else if (!ISSET(NO_UTF8) && mbwidth(buf_mb) > 1) {
            converted[index++] = ' ';
            start_col++;