diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2020-09-15 18:44:01 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2020-09-15 18:44:01 +0300 |
| commit | f4b4166e0075943641cd75c5935959cdc157c585 (patch) | |
| tree | dfcef54ba6efd27c1cb061419491ce7915b34d88 /src/xdisp.c | |
| parent | 9bb9f4370950f9e8e043aa07bab9e9a54fb9d344 (diff) | |
| download | emacs-f4b4166e0075943641cd75c5935959cdc157c585.tar.gz | |
Avoid aborts in display_mode_element
* src/xdisp.c (display_mode_element): Use parse_str_as_multibyte,
not multibyte_chars_in_text, to determine whether mode-line spec
shall be displayed as a multibyte or unibyte string. We cannot
use multibyte_chars_in_text here because it aborts when it finds
raw bytes in the spec string. (Bug#43409)
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 10ddb53dba2..615f0ca7cf8 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -25641,8 +25641,10 @@ display_mode_element (struct it *it, int depth, int field_width, int precision, /* Non-ASCII characters in SPEC should cause mode-line element be displayed as a multibyte string. */ ptrdiff_t nbytes = strlen (spec); - if (multibyte_chars_in_text ((const unsigned char *)spec, - nbytes) != nbytes) + ptrdiff_t nchars, mb_nbytes; + parse_str_as_multibyte ((const unsigned char *)spec, nbytes, + &nchars, &mb_nbytes); + if (!(nbytes == nchars || nbytes != mb_nbytes)) multibyte = true; switch (mode_line_target) |