Update after module 'linebreak' was split.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 8a4f3835e9bc346cdea804a5dfc21ba30f5b0007..ef531571234a5fbd57a89619a906195138a289df 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-10  Bruno Haible  <bruno@clisp.org>
+
+       * write-po.c: Include unilbrk.h instead of linebreak.h.
+       (wrap): Update.
+       * po-lex.c: Don't include linebreak.h.
+
 2008-04-25  Bruno Haible  <bruno@clisp.org>
 
        * lang-table.c (language_table): Add Beja. Remove Adangme, Banda,

diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c
index 1a37ae78423f36e193ef3478a65968fce2d960d7..614abc43d7480684efa89eb7c1b98263d1802fd6 100644 (file)
--- a/gettext-tools/src/po-lex.c
+++ b/gettext-tools/src/po-lex.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1999, 2000-2007 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2008 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>.
    Multibyte character handling by Bruno Haible <haible@clisp.cons.org>.
@@ -37,7 +37,6 @@
 #endif
 
 #include "c-ctype.h"
-#include "linebreak.h"
 #include "uniwidth.h"
 #include "gettext.h"
 #include "po-charset.h"

diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c
index 982d465c0bfed0c69d82e5773b1c03a725e595d5..fe8f0ada2ce1abe7bc997ddb856b2f3a0b0c2fee 100644 (file)
--- a/gettext-tools/src/write-po.c
+++ b/gettext-tools/src/write-po.c
@@ -37,7 +37,7 @@
 #include "c-ctype.h"
 #include "po-charset.h"
 #include "format.h"
-#include "linebreak.h"
+#include "unilbrk.h"
 #include "msgl-ascii.h"
 #include "write-catalog.h"
 #include "xalloc.h"
@@ -924,7 +924,7 @@ internationalized messages should not contain the `\\%c' escape sequence"),
       startcol -= startcol_after_break;
 
       /* Do line breaking on the portion.  */
-      mbs_width_linebreaks (portion, portion_len, width, startcol, 0,
+      ulc_width_linebreaks (portion, portion_len, width, startcol, 0,
                            overrides, canon_charset, linebreaks);
 
       /* If this is the first line, and we are not using the indented