(SETUP_SYNTAX_TABLE_FOR_OBJECT): Take a byteoffset

* src/syntax.c (SETUP_SYNTAX_TABLE_FOR_OBJECT): Take a byteoffset.
* src/regex-emacs.c (re_search_2, re_match_2): Simplify accordingly.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/syntax.c b/src/syntax.c
index 8ef13eec40a..c1caaa8a739 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -264,14 +264,16 @@ SETUP_SYNTAX_TABLE (ptrdiff_t from, ptrdiff_t count)
 
 /* Same as above, but in OBJECT.  If OBJECT is nil, use current buffer.
    If it is t (which is only used in fast_c_string_match_ignore_case),
-   ignore properties altogether.  */
+   ignore properties altogether.
+   FROMBYTE is an regexp-byteoffset.  */
 
 void
 SETUP_SYNTAX_TABLE_FOR_OBJECT (Lisp_Object object,
-                               ptrdiff_t from, ptrdiff_t count)
+                               ptrdiff_t frombyte, ptrdiff_t count)
 {
   SETUP_BUFFER_SYNTAX_TABLE ();
   gl_state.object = object;
+  ptrdiff_t from = SYNTAX_TABLE_BYTE_TO_CHAR (frombyte);
   if (BUFFERP (gl_state.object))
     {
       struct buffer *buf = XBUFFER (gl_state.object);