Replace LUCID_LIBW, MOTIF_LIBW with TOOLKIT_LIBW.

[gnu-emacs] / src / regex.h

diff --git a/src/regex.h b/src/regex.h
index dd57ba36f574024b93cc8ccba6d5202668266325..ca6758aeec759e151ef1acd57082b2c9a8815198 100644 (file)
--- a/src/regex.h
+++ b/src/regex.h
@@ -2,12 +2,12 @@
    expression library, version 0.12.
 
    Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2001,
    expression library, version 0.12.
 
    Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2001,

-                 2002, 2003, 2004, 2005, 2006, 2007
+                 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

                  Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
                  Free Software Foundation, Inc.
 
    This program 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 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -398,9 +398,16 @@ struct re_pattern_buffer
   unsigned used_syntax : 1;
 
 #ifdef emacs
   unsigned used_syntax : 1;
 
 #ifdef emacs

-  /* If true, multi-byte form in the `buffer' should be recognized as a
-     multibyte character. */
+  /* If true, multi-byte form in the regexp pattern should be
+     recognized as a multibyte character.  */

   unsigned multibyte : 1;
   unsigned multibyte : 1;

+
+  /* If true, multi-byte form in the target of match should be
+     recognized as a multibyte character.  */
+  unsigned target_multibyte : 1;
+
+  /* Charset of unibyte characters at compiling time. */
+  int charset_unibyte;

 #endif
 
 /* [[[end pattern_buffer]]] */
 #endif
 
 /* [[[end pattern_buffer]]] */