Mercurial > hg > xemacs-beta
diff src/regex.c @ 1347:8d350b095c21
[xemacs-hg @ 2003-03-09 12:59:36 by ben]
oops, C++ bites again
widget.texi: Fix Turnbull typos.
config.inc.samp: Note that relative directories are a no-no in BUILD_DIR and
SOURCE_DIR. Use paths relative to $(MAKEROOT) instead.
file-coding.c: Fix up internal magic-cookie code to also check for
`;;;###coding system', already handled by the (redundant)
code in files.el.
regex.c: Fix problem with ordering of initializations and statements -- OK in
C++, not in C.
search.c: Indentation.
| author | ben |
|---|---|
| date | Sun, 09 Mar 2003 12:59:45 +0000 |
| parents | 01c57eb70ae9 |
| children | 19738a2a5138 |
line wrap: on
line diff
--- a/src/regex.c Sun Mar 09 02:27:46 2003 +0000 +++ b/src/regex.c Sun Mar 09 12:59:45 2003 +0000 @@ -6131,9 +6131,11 @@ re_char *dtmp = POS_AFTER_GAP_UNSAFE (d); Ichar emch = itext_ichar_fmt (dtmp, fmt, lispobj); int tempres; +#ifdef emacs + Charxpos charpos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d)); +#endif BEGIN_REGEX_MALLOC_OK (); #ifdef emacs - Charxpos charpos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d)); UPDATE_SYNTAX_CACHE (scache, charpos); #endif tempres = (SYNTAX_FROM_CACHE (scache, emch) != Sword); @@ -6174,13 +6176,13 @@ re_char *dtmp; Ichar emch; int tempres; - BEGIN_REGEX_MALLOC_OK (); #ifdef emacs Charxpos charpos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d)); + BEGIN_REGEX_MALLOC_OK (); UPDATE_SYNTAX_CACHE (scache, charpos); -#endif END_REGEX_MALLOC_OK (); RE_MATCH_RELOCATE_MOVEABLE_DATA_POINTERS (); +#endif dtmp = POS_BEFORE_GAP_UNSAFE (d); DEC_IBYTEPTR_FMT (dtmp, fmt); emch = itext_ichar_fmt (dtmp, fmt, lispobj);