aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1999-07-02 12:15:14 +0000
committerRichard M. Stallman1999-07-02 12:15:14 +0000
commit094d978996da9605ca32cd05e738e6f456bac5bc (patch)
tree2c98ea04fd6e226113fb0cc7e1f72b610df0e6dd
parent716490f0c2a66464638f25cafed4dd3f22452865 (diff)
downloademacs-094d978996da9605ca32cd05e738e6f456bac5bc.tar.gz
emacs-094d978996da9605ca32cd05e738e6f456bac5bc.zip
(read_minibuf): Set the multibyteness of the
minibuffer before inserting `initial' string.
-rw-r--r--src/minibuf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/minibuf.c b/src/minibuf.c
index b1950352d0d..f56e609b8c2 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -370,6 +370,10 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
370 unbind_to (count1, Qnil); 370 unbind_to (count1, Qnil);
371 } 371 }
372 372
373 /* If appropriate, copy enable-multibyte-characters into the minibuffer. */
374 if (inherit_input_method)
375 current_buffer->enable_multibyte_characters = enable_multibyte;
376
373 /* Put in the initial input. */ 377 /* Put in the initial input. */
374 if (!NILP (initial)) 378 if (!NILP (initial))
375 { 379 {
@@ -388,10 +392,6 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
388 if (STRINGP (input_method) && !NILP (Ffboundp (Qactivate_input_method))) 392 if (STRINGP (input_method) && !NILP (Ffboundp (Qactivate_input_method)))
389 call1 (Qactivate_input_method, input_method); 393 call1 (Qactivate_input_method, input_method);
390 394
391 /* If appropriate, copy enable-multibyte-characters into the minibuffer. */
392 if (inherit_input_method)
393 current_buffer->enable_multibyte_characters = enable_multibyte;
394
395 if (!NILP (current_buffer->enable_multibyte_characters) 395 if (!NILP (current_buffer->enable_multibyte_characters)
396 && ! STRING_MULTIBYTE (minibuf_prompt)) 396 && ! STRING_MULTIBYTE (minibuf_prompt))
397 minibuf_prompt = Fstring_make_multibyte (minibuf_prompt); 397 minibuf_prompt = Fstring_make_multibyte (minibuf_prompt);