Mercurial > emacs
comparison src/xdisp.c @ 83279:2006100ee57e
Merged from miles@gnu.org--gnu-2005 (patch 204-213)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-204
Clean up gdb-ui breakpoint faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-205
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-206
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-207
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-208
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-209
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-210
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-211
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-212
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-213
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-319
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 27 Mar 2005 17:29:43 +0000 |
parents | 26c9034f3533 9c0af190d335 |
children | 360860a0006f |
comparison
equal
deleted
inserted
replaced
83278:b2bde606bcf7 | 83279:2006100ee57e |
---|---|
5069 || (it->multibyte_p | 5069 || (it->multibyte_p |
5070 ? ((it->c >= 127 | 5070 ? ((it->c >= 127 |
5071 && it->len == 1) | 5071 && it->len == 1) |
5072 || !CHAR_PRINTABLE_P (it->c) | 5072 || !CHAR_PRINTABLE_P (it->c) |
5073 || (!NILP (Vshow_nonbreak_escape) | 5073 || (!NILP (Vshow_nonbreak_escape) |
5074 && (it->c == 0x8ad || it->c == 0x8a0))) | 5074 && (it->c == 0x8ad || it->c == 0x8a0 |
5075 || it->c == 0xf2d || it->c == 0xf20))) | |
5075 : (it->c >= 127 | 5076 : (it->c >= 127 |
5076 && (!unibyte_display_via_language_environment | 5077 && (!unibyte_display_via_language_environment |
5077 || it->c == unibyte_char_to_multibyte (it->c))))) | 5078 || it->c == unibyte_char_to_multibyte (it->c))))) |
5078 { | 5079 { |
5079 /* IT->c is a control character which must be displayed | 5080 /* IT->c is a control character which must be displayed |
5136 /* Merge the escape-glyph face into the current face. */ | 5137 /* Merge the escape-glyph face into the current face. */ |
5137 face_id = merge_faces (it->f, Qescape_glyph, 0, | 5138 face_id = merge_faces (it->f, Qescape_glyph, 0, |
5138 it->face_id); | 5139 it->face_id); |
5139 } | 5140 } |
5140 | 5141 |
5141 if (it->c == 0x8a0 || it->c == 0x8ad) | 5142 if (it->c == 0x8a0 || it->c == 0x8ad |
5143 || it->c == 0xf20 || it->c == 0xf2d) | |
5142 { | 5144 { |
5143 XSETINT (it->ctl_chars[0], escape_glyph); | 5145 XSETINT (it->ctl_chars[0], escape_glyph); |
5144 g = it->c == 0x8ad ? '-' : ' '; | 5146 g = it->c; |
5145 XSETINT (it->ctl_chars[1], g); | 5147 XSETINT (it->ctl_chars[1], g); |
5146 ctl_len = 2; | 5148 ctl_len = 2; |
5147 goto display_control; | 5149 goto display_control; |
5148 } | 5150 } |
5149 | 5151 |