aboutsummaryrefslogtreecommitdiffstats
path: root/src/syntax.c
diff options
context:
space:
mode:
authorPaul Eggert2018-08-05 18:41:20 -0700
committerPaul Eggert2018-08-05 19:36:09 -0700
commite5652268a993ad9117f7253553c143d60460eb8f (patch)
tree82b54b12fa3c5d41fd5e5345f19613b722709495 /src/syntax.c
parentba8eb994f86206f69cbf9743a67b9d86ef9b1d8f (diff)
downloademacs-e5652268a993ad9117f7253553c143d60460eb8f.tar.gz
emacs-e5652268a993ad9117f7253553c143d60460eb8f.zip
Rename src/regex.c to src/regex-emacs.c.
This is in preparation for using Gnulib regex for etags, to avoid collisions in include directives. * src/regex-emacs.c: Rename from src/regex.c. * src/regex-emacs.h: Rename from src/regex.h. All uses changed. * test/src/regex-emacs-tests.el: Rename from test/src/regex-tests.el.
Diffstat (limited to 'src/syntax.c')
-rw-r--r--src/syntax.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/syntax.c b/src/syntax.c
index c5a4b03955b..2f9fd05ddf4 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -23,7 +23,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
23#include "lisp.h" 23#include "lisp.h"
24#include "character.h" 24#include "character.h"
25#include "buffer.h" 25#include "buffer.h"
26#include "regex.h" 26#include "regex-emacs.h"
27#include "syntax.h" 27#include "syntax.h"
28#include "intervals.h" 28#include "intervals.h"
29#include "category.h" 29#include "category.h"
@@ -267,9 +267,10 @@ SETUP_SYNTAX_TABLE (ptrdiff_t from, ptrdiff_t count)
267 If it is t (which is only used in fast_c_string_match_ignore_case), 267 If it is t (which is only used in fast_c_string_match_ignore_case),
268 ignore properties altogether. 268 ignore properties altogether.
269 269
270 This is meant for regex.c to use. For buffers, regex.c passes arguments 270 This is meant for regex-emacs.c to use. For buffers, regex-emacs.c
271 to the UPDATE_SYNTAX_TABLE functions which are relative to BEGV. 271 passes arguments to the UPDATE_SYNTAX_TABLE functions which are
272 So if it is a buffer, we set the offset field to BEGV. */ 272 relative to BEGV. So if it is a buffer, we set the offset field to
273 BEGV. */
273 274
274void 275void
275SETUP_SYNTAX_TABLE_FOR_OBJECT (Lisp_Object object, 276SETUP_SYNTAX_TABLE_FOR_OBJECT (Lisp_Object object,
@@ -3729,7 +3730,7 @@ syms_of_syntax (void)
3729 staticpro (&gl_state.current_syntax_table); 3730 staticpro (&gl_state.current_syntax_table);
3730 staticpro (&gl_state.old_prop); 3731 staticpro (&gl_state.old_prop);
3731 3732
3732 /* Defined in regex.c. */ 3733 /* Defined in regex-emacs.c. */
3733 staticpro (&re_match_object); 3734 staticpro (&re_match_object);
3734 3735
3735 DEFSYM (Qscan_error, "scan-error"); 3736 DEFSYM (Qscan_error, "scan-error");