From 3fb62b8ac1034e272e9dd8a4ebdeb7a0d710206b Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Tue, 18 Dec 2007 22:00:17 +0000
Subject: [PATCH] =?UTF-8?q?in=20print=5Fopt=5Ffull(),=20use=20strlenpt()?=
=?UTF-8?q?=20instead=20of=20strlen(),=20so=20that=20tabs=20are=20placed?=
=?UTF-8?q?=20properly=20when=20displaying=20translated=20strings=20in=20U?=
=?UTF-8?q?TF-8,=20as=20found=20by=20Jean-Philippe=20Gu=C3=A9rard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4208 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 6 ++++++
src/nano.c | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3329b8ef..f7ec7fac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-18 David Lawrence Ramsey <pooka109@gmail.com>
+
+ * nano.c (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.
+
2007-12-17 David Lawrence Ramsey <pooka109@gmail.com>
* configure.ac, doc/texinfo/nano.texi, nano.c (terminal_init):
diff --git a/src/nano.c b/src/nano.c
index 6ec46014..b676fc93 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -752,14 +752,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
--
GitLab