diff options
| author | Richard M. Stallman | 1997-12-21 02:17:50 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-12-21 02:17:50 +0000 |
| commit | 7da0b0d3568c7f1b5ee8e77045c5721697207353 (patch) | |
| tree | 0f773634bc6cf280787148b525690e1d50440973 /src/alloc.c | |
| parent | 44461111ef6f632c63c92790d217a8653693cb1d (diff) | |
| download | emacs-7da0b0d3568c7f1b5ee8e77045c5721697207353.tar.gz emacs-7da0b0d3568c7f1b5ee8e77045c5721697207353.zip | |
(Fgarbage_collect):
Save message_enable_multibyte and pass it to message2_nolog.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; | |||
| 189 | static void mark_object (), mark_buffer (), mark_kboards (); | 189 | static void mark_object (), mark_buffer (), mark_kboards (); |
| 190 | static void clear_marks (), gc_sweep (); | 190 | static void clear_marks (), gc_sweep (); |
| 191 | static void compact_strings (); | 191 | static void compact_strings (); |
| 192 | |||
| 193 | extern int message_enable_multibyte; | ||
| 192 | 194 | ||
| 193 | /* Versions of malloc and realloc that print warnings as memory gets full. */ | 195 | /* Versions of malloc and realloc that print warnings as memory gets full. */ |
| 194 | 196 | ||
| @@ -1543,6 +1545,7 @@ Garbage collection happens automatically if you cons more than\n\ | |||
| 1543 | register Lisp_Object tem; | 1545 | register Lisp_Object tem; |
| 1544 | char *omessage = echo_area_glyphs; | 1546 | char *omessage = echo_area_glyphs; |
| 1545 | int omessage_length = echo_area_glyphs_length; | 1547 | int omessage_length = echo_area_glyphs_length; |
| 1548 | int oldmultibyte = message_enable_multibyte; | ||
| 1546 | char stack_top_variable; | 1549 | char stack_top_variable; |
| 1547 | register int i; | 1550 | register int i; |
| 1548 | 1551 | ||
| @@ -1695,7 +1698,7 @@ Garbage collection happens automatically if you cons more than\n\ | |||
| 1695 | if (garbage_collection_messages) | 1698 | if (garbage_collection_messages) |
| 1696 | { | 1699 | { |
| 1697 | if (omessage || minibuf_level > 0) | 1700 | if (omessage || minibuf_level > 0) |
| 1698 | message2_nolog (omessage, omessage_length); | 1701 | message2_nolog (omessage, omessage_length, oldmultibyte); |
| 1699 | else | 1702 | else |
| 1700 | message1_nolog ("Garbage collecting...done"); | 1703 | message1_nolog ("Garbage collecting...done"); |
| 1701 | } | 1704 | } |