(insert-char-data): Fix format of `iso-10646-comment'; swap order of

[chise/xemacs-chise.git] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index 30489d4..0c59b8e 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -276,7 +276,7 @@ print_buffer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
    because all buffers have `kill-buffer' applied to them before
    they disappear, and the children removal happens then. */
 DEFINE_LRECORD_IMPLEMENTATION ("buffer", buffer,
-                               mark_buffer, print_buffer, 0, 0, 0,
+                               mark_buffer, print_buffer, 0, 0, 0, 0,
                               struct buffer);
 \f
 DEFUN ("bufferp", Fbufferp, 1, 1, 0, /*
@@ -541,7 +541,7 @@ get_truename_buffer (REGISTER Lisp_Object filename)
 static struct buffer *
 allocate_buffer (void)
 {
-  struct buffer *b = alloc_lcrecord_type (struct buffer, lrecord_buffer);
+  struct buffer *b = alloc_lcrecord_type (struct buffer, &lrecord_buffer);
 
   copy_lcrecord (b, XBUFFER (Vbuffer_defaults));
 
@@ -2073,8 +2073,8 @@ complex_vars_of_buffer (void)
 {
   /* Make sure all markable slots in buffer_defaults
      are initialized reasonably, so mark_buffer won't choke. */
-  struct buffer *defs = alloc_lcrecord_type (struct buffer, lrecord_buffer);
-  struct buffer *syms = alloc_lcrecord_type (struct buffer, lrecord_buffer);
+  struct buffer *defs = alloc_lcrecord_type (struct buffer, &lrecord_buffer);
+  struct buffer *syms = alloc_lcrecord_type (struct buffer, &lrecord_buffer);
 
   staticpro (&Vbuffer_defaults);
   staticpro (&Vbuffer_local_symbols);
@@ -2698,11 +2698,11 @@ directory_is_current_directory (char *pwd)
   GET_C_CHARPTR_INT_FILENAME_DATA_ALLOCA (pwd, pwd_internal);
 
   return (IS_DIRECTORY_SEP (*pwd_internal)
-         && stat (pwd_internal, &pwdstat) == 0
-         && stat ("."         , &dotstat) == 0
+         && stat ((char *) pwd_internal, &pwdstat) == 0
+         && stat (".", &dotstat) == 0
          && dotstat.st_ino == pwdstat.st_ino
          && dotstat.st_dev == pwdstat.st_dev
-         && (int) strlen (pwd_internal) < MAXPATHLEN);
+         && (int) strlen ((char *) pwd_internal) < MAXPATHLEN);
 }
 
 void
@@ -2734,7 +2734,7 @@ init_initial_directory (void)
        initial_directory[len + 1] = '\0';
       }
   }
-  
+
   /* XEmacs change: store buffer's default directory
      using preferred (i.e. as defined at compile-time)
      directory separator. --marcpa */