Re: diff -y + UTF-8 = irregular columns

[Paul Eggert]

Bruno Haible <address@hidden> writes:

> I don't see a test of HAVE_MBRTOWC.

Thanks for catching that.  I installed this further fix.
At some point some of this should be refactored into gnulib
along with similar code in gnulib, but that can wait.

2008-01-24  Paul Eggert  <address@hidden>

        * src/side.c [!HAVE_MBRTOWC]: Supply defns for mbstate_t and mbrtowc.
        Problem reported by Bruno Haible.

--- src/side.c  24 Jan 2008 00:02:11 -0000      1.18
+++ src/side.c  24 Jan 2008 17:49:43 -0000
@@ -24,6 +24,13 @@

 #include <wchar.h>

+#if !HAVE_MBRTOWC
+/* Disable multibyte processing entirely.  */
+# undef mbstate_t
+# define mbstate_t int
+# define mbrtowc(pwc, s, n, ps) ((*(pwc) = *(s)) != 0)
+#endif
+
 static void print_sdiff_common_lines (lin, lin);
 static void print_sdiff_hunk (struct change *);