Support non-ASCII correctly in character classes, test this. src/ChangeLog addition: 2012-04-21 Aidan Kehoe <kehoea@parhasard.net> Support non-ASCII correctly in character classes ([:alnum:] and friends). * regex.c: * regex.c (ISBLANK, ISUNIBYTE): New. Make these and friends independent of the locale, since we want them to be consistent in XEmacs. * regex.c (print_partial_compiled_pattern): Print the flags for charset_mule; don't print non-ASCII as the character values in ranges, this breaks with locales. * regex.c (enum): Define various flags the charset_mule and charset_mule_not opcodes can now take. * regex.c (CHAR_CLASS_MAX_LENGTH): Update this. * regex.c (re_iswctype, re_wctype): New, from GNU. * regex.c (re_wctype_can_match_non_ascii): New; used when deciding on whether to use charset_mule or the ASCII-only regex character set opcode. * regex.c (regex_compile): Error correctly on long, non-existent character class names. Break out the handling of charsets that can match non-ASCII into a separate clause. Use compile_char_class when compiling character classes. * regex.c (compile_char_class): New. Used in regex_compile when compiling character sets that may match non-ASCII. * regex.c (re_compile_fastmap): If there are flags set for charset_mule or charset_mule_not, we can't use the fastmap (since we need to check syntax table values that aren't available there). * regex.c (re_match_2_internal): Check the new flags passed to the charset_mule{,_not} opcode, observe them if appropriate. * regex.h: * regex.h (enum): Expose re_wctype_t here, imported from GNU. tests/ChangeLog addition: 2012-04-21 Aidan Kehoe <kehoea@parhasard.net> * automated/regexp-tests.el: * automated/regexp-tests.el (Assert-char-class): Check that #'string-match errors correctly with an over-long character class name. Add tests for character class functionality that supports non-ASCII characters. These tests expose bugs in GNU Emacs 24.0.94.2, but pass under current XEmacs.

/* XPM */

/* This file is part of XEmacs.

XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation, either version 3 of the License, or (at your
option) any later version.

XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
for more details.

You should have received a copy of the GNU General Public License
along with XEmacs.  If not, see <http://www.gnu.org/licenses/>. */

static char * recycle2_xpm[] = {
/* width height ncolors cpp [x_hot y_hot] */
"32 32 4 1 26 23",
/* colors */
" 	s none	m none	c none",
".	s iconColor1	m black	c black",
"X	c #7F7FFFFF0000",
"o	c #45458B8B0000",
/* pixels */
"                                ",
"           ............         ",
"         .XXXXXXXX.oooXX.       ",
"         XXXXXXXX.ooXXXXX.      ",
"        .XXXXXXXX.ooXXXXXX  ..  ",
"        .XXXXXXX..XXXXXXXX .o.  ",
"       .XXXXXXXX  .XXXXXXXXX.   ",
"       XXXXXXXX.   XXXXXXXX.    ",
"      .XXXXXXXX.   XXXXXXXX     ",
"        .XXXXX.    .XXXXXX.     ",
"         ..XXX   ..XXXXXXX      ",
" .........  ..            .XX   ",
"  .XXXXXXX.             .XXXX.  ",
"   .XXXXXX.           ..XXXXXX. ",
"   .XXXXXXX.          XXXXXXXXX ",
"   .XXXXXXX.          .XXXXXXXX ",
"  .XXXXXXXXX.          .XXXXXXX.",
"  .XXXXXXX..X.          XXXXXXX.",
"  .XXXXXXX. ..      .   XXXXXXX.",
"   .XXXXX.         .X   .XXXXXX ",
"    XXXXX          .X    .XXXX. ",
"    .XXX........   XX.........  ",
"     .X.ooXXXXXX  .XXXXXXXXXo   ",
"     .X.oXoXXXXX .XXXXXXXXXXo   ",
"      XooXXXXXXX XXXXXXXXXXo.   ",
"      .ooXXXXXXX XXXXXXXXXX.    ",
"       ooXXXXXXX .XXXXXXXXo     ",
"        .XXXXXXX  .XXXXXo.      ",
"         .......   XX....       ",
"                   .X           ",
"                   .X           ",
"                    .           "};