Mercurial > emacs
comparison src/xdisp.c @ 90068:eac554634bfa
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-79
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-735
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-747
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 25 Dec 2004 02:00:25 +0000 |
parents | fb79180b618d 36d7c274dcef |
children | fa0a5c4db2c8 |
comparison
equal
deleted
inserted
replaced
90067:b481c5870e10 | 90068:eac554634bfa |
---|---|
5048 | 5048 |
5049 g = FAST_MAKE_GLYPH (it->c ^ 0100, face_id); | 5049 g = FAST_MAKE_GLYPH (it->c ^ 0100, face_id); |
5050 XSETINT (it->ctl_chars[1], g); | 5050 XSETINT (it->ctl_chars[1], g); |
5051 ctl_len = 2; | 5051 ctl_len = 2; |
5052 } | 5052 } |
5053 else if (it->c == 0x8a0 || it->c == 0x8ad) | |
5054 { | |
5055 /* Set IT->ctl_chars[0] to the glyph for `\\'. */ | |
5056 if (it->dp | |
5057 && INTEGERP (DISP_ESCAPE_GLYPH (it->dp)) | |
5058 && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (it->dp)))) | |
5059 g = XINT (DISP_ESCAPE_GLYPH (it->dp)); | |
5060 else | |
5061 g = FAST_MAKE_GLYPH ('\\', face_id); | |
5062 XSETINT (it->ctl_chars[0], g); | |
5063 | |
5064 g = FAST_MAKE_GLYPH (it->c == 0x8ad ? '-' : ' ', face_id); | |
5065 XSETINT (it->ctl_chars[1], g); | |
5066 ctl_len = 2; | |
5067 } | |
5053 else | 5068 else |
5054 { | 5069 { |
5055 unsigned char str[MAX_MULTIBYTE_LENGTH]; | 5070 unsigned char str[MAX_MULTIBYTE_LENGTH]; |
5056 int len; | 5071 int len; |
5057 int i; | 5072 int i; |