From edd8161851b86908e21aeee0218fe01d84daad80 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 21 Oct 2007 21:36:37 +0200 Subject: [PATCH] Replace wcwidth also if it fails on U+200B (ZERO WIDTH SPACE). --- ChangeLog | 5 +++++ m4/wcwidth.m4 | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe44bcf1d1..a323203707 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-21 Bruno Haible + + * m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Check also the width of U+200B. + Needed on OSF/1 5.1. + 2007-10-21 Bruno Haible * tests/test-floorf1.c: Include isnanf.h. diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index df7919bd73..04a9fc270b 100644 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -1,4 +1,4 @@ -# wcwidth.m4 serial 12 +# wcwidth.m4 serial 13 dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -37,6 +37,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH], REPLACE_WCWIDTH=1 else dnl On MacOS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1. + dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1. dnl This leads to bugs in 'ls' (coreutils). AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales], [gl_cv_func_wcwidth_works], @@ -63,7 +64,7 @@ int wcwidth (int); int main () { if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL) - if (wcwidth (0x0301) > 0) + if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0) return 1; return 0; }], [gl_cv_func_wcwidth_works=yes], [gl_cv_func_wcwidth_works=no], -- 2.30.2