changeset 27692:bb0e45f6ca86

* regex.h (RE_SYNTAX_EMACS): Add RE_CHAR_CLASSES and RE_INTERVALS to Emacs' syntax. Also fix the comment about set/not-set meanings since Emacs syntax is not the value 0 any more. * search.c (compile_pattern_1): Remove RE_CHAR_CLASSES from the syntax since it's now part of RE_SYNTAX_EMACS.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 14 Feb 2000 17:00:16 +0000
parents 5ed8dd27c116
children d8bedafef8d5
files src/ChangeLog src/regex.h src/search.c
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
Binary file src/ChangeLog has changed
--- a/src/regex.h	Sun Feb 13 23:50:32 2000 +0000
+++ b/src/regex.h	Mon Feb 14 17:00:16 2000 +0000
@@ -32,8 +32,9 @@
 
 
 /* The following bits are used to determine the regexp syntax we
-   recognize.  The set/not-set meanings are chosen so that Emacs syntax
-   remains the value 0.  The bits are given in alphabetical order, and
+   recognize.  The set/not-set meanings where historically chosen so
+   that Emacs syntax had the value 0.
+   The bits are given in alphabetical order, and
    the definitions shifted by one from the previous bit; thus, when we
    add or remove a bit, only one other definition need change.  */
 typedef unsigned reg_syntax_t;
@@ -153,9 +154,9 @@
 
 /* Define combinations of the above bits for the standard possibilities.
    (The [[[ comments delimit what gets put into the Texinfo file, so
-   don't delete them!)  */ 
+   don't delete them!)  */
 /* [[[begin syntaxes]]] */
-#define RE_SYNTAX_EMACS 0
+#define RE_SYNTAX_EMACS (RE_CHAR_CLASSES | RE_INTERVALS)
 
 #define RE_SYNTAX_AWK							\
   (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL			\
--- a/src/search.c	Sun Feb 13 23:50:32 2000 +0000
+++ b/src/search.c	Mon Feb 14 17:00:16 2000 +0000
@@ -167,7 +167,7 @@
   cp->posix = posix;
   cp->buf.multibyte = multibyte;
   BLOCK_INPUT;
-  old = re_set_syntax (RE_SYNTAX_EMACS | RE_CHAR_CLASSES
+  old = re_set_syntax (RE_SYNTAX_EMACS
 		       | (posix ? 0 : RE_NO_POSIX_BACKTRACKING));
   val = (char *) re_compile_pattern ((char *)raw_pattern,
 				     raw_pattern_size, &cp->buf);