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.

+
−/* Color data structures for X and Xft.
+
−
+
−Copyright (C) 2004 Free Software Foundation, Inc.
+
−
+
−Author:		Stephen J. Turnbull <stephen@xemacs.org>
+
−Created:	24 Jul 2004 by Stephen J. Turnbull
+
−
+
−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/>. */
+
−
+
−/* Synched up with: Not in GNU Emacs. */
+
−
+
−#ifndef INCLUDED_lwlib_colors_h_
+
−#define INCLUDED_lwlib_colors_h_
+
−
+
−#include <X11/Xlib.h>
+
−
+
−/* WIDGET is an Xt widget, VISUAL and DEPTH are return values */
+
−void visual_info_from_widget (Widget widget, Visual **visual, int *depth);
+
−
+
−/* basic version from xlwmenu.c */
+
−int FIXME_allocate_nearest_color (Display *display, Colormap screen_colormap,
+
−				  XColor *color_def);
+
−/* haired-up version from ../src/fontcolor-x.c */
+
−int x_allocate_nearest_color (Display *display, Colormap screen_colormap,
+
−			      Visual *visual, XColor *color_def);
+
−
+
−#ifdef HAVE_XFT
+
−#define _XFT_NO_COMPAT_
+
−/* shut up GCC */
+
−#define face_index face_index_arg
+
−#define glyph_index glyph_index_arg
+
−#include <X11/Xft/Xft.h>
+
−#undef glyph_index
+
−#undef face_index
+
−
+
−#if XFT_MAJOR < 2
+
−#error Xft versions < 2 not supported
+
−#endif
+
−
+
−XftColor xft_convert_color (Display *dpy, Colormap cmap, Visual *visual,
+
−			    int c, int dim);
+
−#endif /* HAVE_XFT */
+
−
+
−#endif /* INCLUDED_lwlib_colors_h_ */