changeset 20544:a884f0426ab9

(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos. Wrap in if (1) ... else.
author Richard M. Stallman <rms@gnu.org>
date Thu, 01 Jan 1998 02:46:10 +0000
parents 4dbda4b7c66f
children c20c92ff4055
files src/syntax.h
diffstat 1 files changed, 29 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/syntax.h	Thu Jan 01 02:45:12 1998 +0000
+++ b/src/syntax.h	Thu Jan 01 02:46:10 1998 +0000
@@ -239,31 +239,37 @@
 
    This is meant for regex.c to use.  For buffers, regex.c passes arguments
    to the UPDATE_SYNTAX_TABLE macros which are relative to BEGV.
-   So if it is a buffer,a we set the offset field to BEGV.  */
+   So if it is a buffer, we set the offset field to BEGV.  */
 
 #define SETUP_SYNTAX_TABLE_FOR_OBJECT(object, from, count)		\
-  if (BUFFERP (object) || NILP (object))				\
-    {									\
-      gl_state.b_property = BEGV - 1;					\
-      gl_state.e_property = ZV;						\
-      gl_state.offset = BEGV - 1;					\
-    }									\
-  else if (EQ (object, Qt))						\
-    {									\
-      gl_state.b_property = - 1;					\
-      gl_state.e_property = 1500000000;					\
-      gl_state.offset = 0;						\
-    }									\
-  else									\
-    {									\
-      gl_state.b_property = -1;						\
-      gl_state.e_property = 1 + XSTRING (object)->size;			\
-      gl_state.offset = 0;						\
-    }									\
-  gl_state.use_global = 0;						\
-  gl_state.current_syntax_table = current_buffer->syntax_table;		\
-  if (parse_sexp_lookup_properties) 					\
-      update_syntax_table (count > 0 ? (from) : (from) - 1, count, 1, object);
+if (1)									\
+  {									\
+    if (BUFFERP (object) || NILP (object))				\
+      {									\
+	gl_state.b_property = BEGV - 1;					\
+	gl_state.e_property = ZV;					\
+	gl_state.offset = BEGV - 1;					\
+      }									\
+    else if (EQ (object, Qt))						\
+      {									\
+	gl_state.b_property = - 1;					\
+	gl_state.e_property = 1500000000;				\
+	gl_state.offset = 0;						\
+      }									\
+    else								\
+      {									\
+	gl_state.b_property = -1;					\
+	gl_state.e_property = 1 + XSTRING (object)->size;		\
+	gl_state.offset = 0;						\
+      }									\
+    gl_state.use_global = 0;						\
+    gl_state.current_syntax_table = current_buffer->syntax_table;	\
+    if (parse_sexp_lookup_properties)					\
+      update_syntax_table ((bytepos_to_charpos (from)			\
+			    + (count > 0 ? 0 :  -1)),			\
+			   count, 1, object);				\
+  }									\
+else
 
 struct gl_state_s
 {