* 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.

diff --git a/regex.h b/regex.h
index 36775d567aa28c02dcb137701fe78c3dc550a3f3..b39fc1e770e66cfaea38ba2cb10a68bfbf9a30b7 100644 (file)
--- a/regex.h
+++ b/regex.h
@@ -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 @@ extern Lisp_Object re_match_object;
 \f
 /* 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                      \