X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Falloc.c;h=54f3c38f0965c6ab645dfdbedda435bfb4b42c42;hb=71baa1c0cbbb886ac1528500c1bda51ac70decad;hp=a0633130210168001c3a143462396bdad559b7cc;hpb=426fe636212336bb32a5e6f187c4d623709fa57d;p=chise%2Fxemacs-chise.git.1

diff --git a/src/alloc.c b/src/alloc.c
index a063313..54f3c38 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -412,7 +412,7 @@ free_lcrecord (struct lcrecord_header *lcrecord)
 	      break;
 	    }
 	  else if (next == 0)
-	    abort ();
+	    ABORT ();
 	  else
 	    header = next;
 	}
@@ -2051,6 +2051,10 @@ LENGTH must be a non-negative integer.
 	    Bufbyte *init_ptr = init_str;
 	    switch (len)
 	      {
+#ifdef UTF2000
+	      case 6: *ptr++ = *init_ptr++;
+	      case 5: *ptr++ = *init_ptr++;
+#endif
 	      case 4: *ptr++ = *init_ptr++;
 	      case 3: *ptr++ = *init_ptr++;
 	      case 2: *ptr++ = *init_ptr++;
@@ -3387,6 +3391,7 @@ garbage_collect_1 (void)
   /***** Now we actually start the garbage collection. */
 
   gc_in_progress = 1;
+  inhibit_non_essential_printing_operations = 1;
 
   gc_generation_number[0]++;
 
@@ -3511,6 +3516,7 @@ garbage_collect_1 (void)
     gc_cons_threshold = 10000;
 #endif
 
+  inhibit_non_essential_printing_operations = 0;
   gc_in_progress = 0;
 
   run_post_gc_actions ();
@@ -3882,8 +3888,8 @@ reinit_alloc_once_early (void)
 #ifdef DOUG_LEA_MALLOC
   mallopt (M_TRIM_THRESHOLD, 128*1024); /* trim threshold */
   mallopt (M_MMAP_THRESHOLD, 64*1024); /* mmap threshold */
-#if 0 /* Moved to emacs.c */
-  mallopt (M_MMAP_MAX, 64); /* max. number of mmap'ed areas */
+#if 1 /* Moved to emacs.c */
+  mallopt (M_MMAP_MAX, 0); /* max. number of mmap'ed areas */
 #endif
 #endif
   init_string_alloc ();