procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(get_next_display_element): Sync to the change in HEAD

Browse source 
on 2004-12-21.
This commit is contained in:
Kenichi Handa 2004-12-25 02:31:08 +00:00
parent 6a89b7e95a
commit 0e9dd01c12
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/xdisp.c
View file

@ -5007,10 +5007,13 @@ get_next_display_element (it)
|| (it->c != '\n'
&& it->glyph_row && it->glyph_row->mode_line_p)
|| (it->c != '\n' && it->c != '\t'))
: it->multibyte_p ? !CHAR_PRINTABLE_P (it->c)
: (it->c >= 127
&& (! unibyte_display_via_language_environment
|| (UNIBYTE_CHAR_HAS_MULTIBYTE_P (it->c))))))
: (it->multibyte_p
? (!CHAR_PRINTABLE_P (it->c)
|| it->c == 0xA0 /* NO-BREAK SPACE */
|| it->c == 0xAD /* SOFT HYPHEN */)
: (it->c >= 127
&& (! unibyte_display_via_language_environment
|| (UNIBYTE_CHAR_HAS_MULTIBYTE_P (it->c)))))))
{
/* IT->c is a control character which must be displayed
either as '\003' or as `^C' where the '\\' and '^'
@ -5050,7 +5053,7 @@ get_next_display_element (it)
XSETINT (it->ctl_chars[1], g);
ctl_len = 2;
}
else if (it->c == 0x8a0 || it->c == 0x8ad)
else if (it->c == 0xA0 || it->c == 0xAD)
{
/* Set IT->ctl_chars[0] to the glyph for `\\'. */
if (it->dp
@ -5061,7 +5064,7 @@ get_next_display_element (it)
g = FAST_MAKE_GLYPH ('\\', face_id);
XSETINT (it->ctl_chars[0], g);
g = FAST_MAKE_GLYPH (it->c == 0x8ad ? '-' : ' ', face_id);
g = FAST_MAKE_GLYPH (it->c == 0xAD ? '-' : ' ', face_id);
XSETINT (it->ctl_chars[1], g);
ctl_len = 2;
}