in print_opt_full(), use strlenpt() instead of strlen(), so that tabs

are placed properly when displaying translated strings in UTF-8, as
found by Jean-Philippe Guérard

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

diff --git a/ChangeLog b/ChangeLog
index d345097fdf7f6c81b2c84cc99e70390fc47191db..652302acc7e316a24cd70fbfad5786acc5fd891a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,10 @@ CVS code -
          middle of the line instead of just the uncompleted part of the
          match). (DLR)
 - nano.c:
+  print_opt_full()
+       - Use strlenpt() instead of strlen(), so that tabs are placed
+         properly when displaying translated strings in UTF-8. (DLR,
+         found by Jean-Philippe Guérard)
   version()
        - Display copyright notices. (DLR)
   copy_from_file()

diff --git a/src/nano.c b/src/nano.c
index 3845322e6ad58caf6b7f2849a5c7d89c910203e8..2c193f00e7c673c0ed219638c0f55e6e6271af3e 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -751,14 +751,14 @@ void print_opt_full(const char *shortflag
        , const char *desc)
 {
     printf(" %s\t", shortflag);
-    if (strlen(shortflag) < 8)
+    if (strlenpt(shortflag) < 8)
        printf("\t");
 
 #ifdef HAVE_GETOPT_LONG
     printf("%s\t", longflag);
-    if (strlen(longflag) < 8)
+    if (strlenpt(longflag) < 8)
        printf("\t\t");
-    else if (strlen(longflag) < 16)
+    else if (strlenpt(longflag) < 16)
        printf("\t");
 #endif