(read_minibuf): Set the multibyteness of the

minibuffer before inserting `initial' string.

diff --git a/src/minibuf.c b/src/minibuf.c
index b1950352d0dc48bece04a2b26b329f8ea83d9a95..f56e609b8c259d862304ea244159ad0770a96e9b 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -370,6 +370,10 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
     unbind_to (count1, Qnil);
   }
 
+  /* If appropriate, copy enable-multibyte-characters into the minibuffer.  */
+  if (inherit_input_method)
+    current_buffer->enable_multibyte_characters = enable_multibyte;
+
   /* Put in the initial input.  */
   if (!NILP (initial))
     {
@@ -388,10 +392,6 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
   if (STRINGP (input_method) && !NILP (Ffboundp (Qactivate_input_method)))
     call1 (Qactivate_input_method, input_method);
 
-  /* If appropriate, copy enable-multibyte-characters into the minibuffer.  */
-  if (inherit_input_method)
-    current_buffer->enable_multibyte_characters = enable_multibyte;
-
   if (!NILP (current_buffer->enable_multibyte_characters)
       && ! STRING_MULTIBYTE (minibuf_prompt))
     minibuf_prompt = Fstring_make_multibyte (minibuf_prompt);