From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 21 Dec 1997 02:17:50 +0000 (+0000)
Subject: (Fgarbage_collect):
X-Git-Tag: emacs-20.3~2579
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7da0b0d3568c7f1b5ee8e77045c5721697207353;p=emacs.git

(Fgarbage_collect):
Save message_enable_multibyte and pass it to message2_nolog.
---

diff --git a/src/alloc.c b/src/alloc.c
index 33c4a1578f3..db5ff4b0b50 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -189,6 +189,8 @@ Lisp_Object Qgc_cons_threshold, Qchar_table_extra_slots;
 static void mark_object (), mark_buffer (), mark_kboards ();
 static void clear_marks (), gc_sweep ();
 static void compact_strings ();
+
+extern int message_enable_multibyte;
 
 /* Versions of malloc and realloc that print warnings as memory gets full.  */
 
@@ -1543,6 +1545,7 @@ Garbage collection happens automatically if you cons more than\n\
   register Lisp_Object tem;
   char *omessage = echo_area_glyphs;
   int omessage_length = echo_area_glyphs_length;
+  int oldmultibyte = message_enable_multibyte;
   char stack_top_variable;
   register int i;
 
@@ -1695,7 +1698,7 @@ Garbage collection happens automatically if you cons more than\n\
   if (garbage_collection_messages)
     {
       if (omessage || minibuf_level > 0)
-	message2_nolog (omessage, omessage_length);
+	message2_nolog (omessage, omessage_length, oldmultibyte);
       else
 	message1_nolog ("Garbage collecting...done");
     }