(setup_echo_area_for_printing, set_message_1): Adjusted

for the change of Fset_buffer_multibyte.

diff --git a/src/xdisp.c b/src/xdisp.c
index d2e1098539027220491fb2fc721b75ad541c6372..c68cfe014dd1a55a2905c97028967d729f560273 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6433,7 +6433,7 @@ setup_echo_area_for_printing (multibyte_p)
       /* Set up the buffer for the multibyteness we need.  */
       if (multibyte_p
          != !NILP (current_buffer->enable_multibyte_characters))
-       Fset_buffer_multibyte (multibyte_p ? Qt : Qnil);
+       Fset_buffer_multibyte (multibyte_p ? Qt : Qnil, Qnil);
 
       /* Raise the frame containing the echo area.  */
       if (minibuffer_auto_raise)
@@ -6911,7 +6911,7 @@ set_message_1 (a1, a2, nbytes, multibyte_p)
   /* Change multibyteness of the echo buffer appropriately.  */
   if (message_enable_multibyte
       != !NILP (current_buffer->enable_multibyte_characters))
-    Fset_buffer_multibyte (message_enable_multibyte ? Qt : Qnil);
+    Fset_buffer_multibyte (message_enable_multibyte ? Qt : Qnil, Qnil);
 
   current_buffer->truncate_lines = message_truncate_lines ? Qt : Qnil;