Re: string-match in unicode-2 (Re: Calc broken in Emacs unicode-2 branch)

[Juanma Barranquero]

On 2/15/07, Kenichi Handa <address@hidden> wrote:

> I've just installed a fix for emacs-unicode-2 branch.

The unicode-2 branch fails to compile.  I think the attached patch is
needed, but even with it, I'm getting this error:

In toplevel form:
ja-dic/ja-dic.el:46:1:Error: Args out of range: "ã??s æ??", 1663, 1663
make[2]: *** [ja-dic/ja-dic.elc] Error 1

            Juanma


Index: src/regex.c
===================================================================
RCS file: /sources/emacs/emacs/src/regex.c,v
retrieving revision 1.186.4.20
diff -u -2 -r1.186.4.20 regex.c
--- src/regex.c 15 Feb 2007 11:23:52 -0000      1.186.4.20
+++ src/regex.c 15 Feb 2007 12:22:50 -0000
@@ -312,5 +312,5 @@
# define CHAR_STRING(c, s) (*(s) = (c), 1)
# define STRING_CHAR_AND_LENGTH(p, s, actual_len) ((actual_len) = 1, *(p))
-# define RE_STRING_CHAR_AND_LENGTH(p, s, multibyte)
STRING_CHAR_AND_LENGTH ((p), (s))
+# define RE_STRING_CHAR_AND_LENGTH(p, s, len, multibyte)
STRING_CHAR_AND_LENGTH ((p), (s), (len))
# define RE_CHAR_TO_MULTIBYTE(c) (c)
# define RE_CHAR_TO_UNIBYTE(c) (c)