diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-04-02 23:56:46 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-04-02 23:56:46 +0000 |
| commit | 2d1675e45c46d97aec4c6af28a0719778f79b8da (patch) | |
| tree | 11c6492fbe96211f75cc8f4ac37e7e0cde1538bb /src/regex.h | |
| parent | 096540869a2be7676946ef9c4ee52e5cedb5c28a (diff) | |
| download | emacs-2d1675e45c46d97aec4c6af28a0719778f79b8da.tar.gz | |
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
(RE_MULTIBYTE_P, RE_STRING_CHAR_AND_LENGTH): New macros.
(GET_CHAR_BEFORE_2): Moved from charset.h plus fixed minor bug when
we are between str1 and str2.
(MAX_MULTIBYTE_LENGTH, CHAR_STRING) [!emacs]: Provide trivial default.
(PATFETCH): Use `TRANSLATE'.
(PATFETCH_RAW): Fetch multibyte char if applicable.
(PATUNFETCH): Remove.
(regex_compile): Rely on PATFETCH to do most of the multibyte magic.
When writing a char, write it directly into the pattern buffer rather
than going needlessly through a temp char-array.
(re_match_2_internal): Similarly, rely on RE_STRING_CHAR to do the
multibyte magic and remove the useless `#ifdef emacs'.
(bcmp_translate): Don't compare as multibyte chars when in a unibyte
buffer.
* regex.h (struct re_pattern_buffer): Make field `multibyte'
conditional on `emacs'.
* charset.h (GET_CHAR_BEFORE_2): Moved to regex.c.
Diffstat (limited to 'src/regex.h')
| -rw-r--r-- | src/regex.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/regex.h b/src/regex.h index 9ebc4e0bf22..9ee2060a1ed 100644 --- a/src/regex.h +++ b/src/regex.h @@ -362,9 +362,11 @@ struct re_pattern_buffer /* If true, an anchor at a newline matches. */ unsigned newline_anchor : 1; +#ifdef emacs /* If true, multi-byte form in the `buffer' should be recognized as a multibyte character. */ unsigned multibyte : 1; +#endif /* [[[end pattern_buffer]]] */ }; |