in titlebar(), handle VERLEN's being a UTF-8 string

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

diff --git a/ChangeLog b/ChangeLog
index c0c49794f8ca4a624bc667bb2f589489fbb543af..4efbe187b58b499947ba520b684cf3f6c38aa2d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -316,6 +316,9 @@ CVS code -
          done.  This fixes a problem where the statusbar is not
          properly blanked after using the "Go To Line" prompt with the
          NO_HELP flag set. (DLR)
+  titlebar()
+       - Use actual_x() to calculate the number of characters VERMSG
+         takes up, in case it's UTF-8. (DLR)
   do_help()
        - Don't treat NANO_CANCEL_KEY as NANO_EXIT_KEY anymore, for
          consistency. (DLR)

diff --git a/src/winio.c b/src/winio.c
index 49236a34898b1641ea40c97d96a46d70bbff9b2b..40f8666dbe157a1bbccc80ea803e37da9d3ef867 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -2722,7 +2722,8 @@ void titlebar(const char *path)
     if (COLS > 4) {
        /* The version message should only take up 1/3 of the screen
         * minus one column. */
-       mvwaddnstr(topwin, 0, 2, VERMSG, (COLS / 3) - 3);
+       mvwaddnstr(topwin, 0, 2, VERMSG, actual_x(VERMSG,
+               (COLS / 3) - 3));
        waddstr(topwin, "  ");
     }