X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbuffer.h;h=2c5498d28e7958b845e71e903ddfc3fba185935a;hb=ea1ea793fe6e244ef5555ed983423a204101af13;hp=f9bf6c14e59f4df0dd0ba4851c2fa44a9249909b;hpb=77dcef404dc78635f6ffa8f71a803d2bc7cc8921;p=chise%2Fxemacs-chise.git

diff --git a/src/buffer.h b/src/buffer.h
index f9bf6c1..2c5498d 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -219,7 +219,6 @@ DECLARE_LRECORD (buffer, struct buffer);
 #define XBUFFER(x) XRECORD (x, buffer, struct buffer)
 #define XSETBUFFER(x, p) XSETRECORD (x, p, buffer)
 #define BUFFERP(x) RECORDP (x, buffer)
-#define GC_BUFFERP(x) GC_RECORDP (x, buffer)
 #define CHECK_BUFFER(x) CHECK_RECORD (x, buffer)
 #define CONCHECK_BUFFER(x) CONCHECK_RECORD (x, buffer)
 
@@ -409,6 +408,9 @@ for (mps_bufcons = Qunbound,							\
 #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 +421,11 @@ for (mps_bufcons = Qunbound,							\
   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 +436,7 @@ for (mps_bufcons = Qunbound,							\
 } 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 */
@@ -559,7 +567,7 @@ XCHAR_OR_CHAR_INT (Lisp_Object obj)
 
 #else
 
-#define XCHAR_OR_CHAR_INT(obj) (CHARP ((obj)) ? XCHAR ((obj)) : XINT ((obj)))
+#define XCHAR_OR_CHAR_INT(obj) (CHARP (obj) ? XCHAR (obj) : XINT (obj))
 
 #endif
 
@@ -1513,6 +1521,7 @@ extern struct buffer *current_buffer;
 
 /* This is the initial (startup) directory, as used for the *scratch* buffer.
    We're making this a global to make others aware of the startup directory.
+   `initial_directory' is stored in external format.
  */
 extern char initial_directory[];
 extern void init_initial_directory (void);   /* initialize initial_directory */