clarify the warning message when sufficient wide character support isn't

found, and merge missing part of DB's patch to handle tabs properly in
display_string()

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

diff --git a/configure.ac b/configure.ac
index fcbfb6afa607b7507c741ca5c370450648e8c8f6..c9c0b6491b10fedfc1c9e0b97dba429ca2eb8420 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -361,7 +361,7 @@ if test "x$CURSES_LIB_WIDE" = "xyes" -a "x$ac_cv_func_mbtowc" = "xyes" -a "x$ac_
 then
        AC_DEFINE(NANO_WIDE, 1, [Define this if your system has wide character support (a wide curses library, mbtowc(), wctomb(), and wcwidth()).])
 else
-       AC_MSG_WARN([No wide character support found.  nano will not be able to support UTF-8.])
+       AC_MSG_WARN([Insufficient wide character support found.  nano will not be able to support UTF-8.])
 fi
 
 AC_CONFIG_FILES([

diff --git a/src/winio.c b/src/winio.c
index c9937b6c734f49f8f3295d014c6869485b71fcea..a61e660ce6080ce0d871b8474d9acf0b04933b0e 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -1937,7 +1937,7 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
 #endif
                ' '; 
            start_col++;
-           while ((column + index) % tabsize) {
+           while (start_col % tabsize != 0) {
                converted[index++] = ' ';
                start_col++;
            }