--- a/src/buffer.h	Mon Aug 13 11:24:10 2007 +0200
+++ b/src/buffer.h	Mon Aug 13 11:25:01 2007 +0200
@@ -409,6 +409,9 @@
 #define REAL_INC_CHARPTR(ptr) \
   ((void) ((ptr) += REP_BYTES_BY_FIRST_BYTE (* (unsigned char *) (ptr))))
 
+#define REAL_INC_CHARBYTIND(ptr,pos) \
+  (pos += REP_BYTES_BY_FIRST_BYTE (* (unsigned char *) (ptr)))
+
 #define REAL_DEC_CHARPTR(ptr) do {	\
   (ptr)--;				\
 } while (!VALID_CHARPTR_P (ptr))
@@ -419,6 +422,11 @@
   REAL_INC_CHARPTR (ptr);		\
 } while (0)
 
+#define INC_CHARBYTIND(ptr,pos) do {		\
+  ASSERT_VALID_CHARPTR (ptr);		\
+  REAL_INC_CHARBYTIND (ptr,pos);		\
+} while (0)
+
 #define DEC_CHARPTR(ptr) do {			\
   CONST Bufbyte *dc_ptr1 = (ptr);		\
   CONST Bufbyte *dc_ptr2 = dc_ptr1;		\
@@ -429,6 +437,7 @@
 } while (0)
 
 #else /* ! ERROR_CHECK_BUFPOS */
+#define INC_CHARBYTIND(ptr,pos) REAL_INC_CHARBYTIND (ptr,pos)
 #define INC_CHARPTR(ptr) REAL_INC_CHARPTR (ptr)
 #define DEC_CHARPTR(ptr) REAL_DEC_CHARPTR (ptr)
 #endif /* ! ERROR_CHECK_BUFPOS */