summaryrefslogtreecommitdiff
path: root/src/xdisp.c
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-12-21 02:17:16 +0000
committerRichard M. Stallman <rms@gnu.org>1997-12-21 02:17:16 +0000
commit44461111ef6f632c63c92790d217a8653693cb1d (patch)
tree5b5071735788a82c55260eff4bd7c27c1e3ae43c /src/xdisp.c
parent30c6e0629b98431f19cb836b2cb7269fb8d5dadb (diff)
downloademacs-44461111ef6f632c63c92790d217a8653693cb1d.tar.gz
(message2_nolog): New arg MULTIBYTE.
(message2): Pass new arg to message2_nolog. (message1_nolog): Likewise.
Diffstat (limited to 'src/xdisp.c')
-rw-r--r--src/xdisp.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index cc65fff9ae9..4eac7d54592 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -459,19 +459,19 @@ message2 (m, len)
message_log_maybe_newline ();
if (m)
message_dolog (m, len, 1);
- message2_nolog (m, len);
+ message2_nolog (m, len,
+ ! NILP (current_buffer->enable_multibyte_characters));
}
/* The non-logging counterpart of message2. */
void
-message2_nolog (m, len)
+message2_nolog (m, len, multibyte)
char *m;
int len;
{
- message_enable_multibyte
- = ! NILP (current_buffer->enable_multibyte_characters);
+ message_enable_multibyte = multibyte;
if (noninteractive)
{
@@ -542,7 +542,8 @@ void
message1_nolog (m)
char *m;
{
- message2_nolog (m, (m ? strlen (m) : 0));
+ message2_nolog (m, (m ? strlen (m) : 0),
+ ! NILP (current_buffer->enable_multibyte_characters));
}
/* Truncate what will be displayed in the echo area