comparison src/xdisp.c @ 59053:36d7c274dcef

(get_next_display_element): Display codes 8a0 and 8ad specially as `\ ' and `\-'.
author Richard M. Stallman <rms@gnu.org>
date Tue, 21 Dec 2004 11:35:18 +0000
parents 877029420a0c
children 6ae984fd783d 4ee39d9428b0 eac554634bfa
comparison
equal deleted inserted replaced
59052:e108ef5b9044 59053:36d7c274dcef
4913 && it->glyph_row && it->glyph_row->mode_line_p) 4913 && it->glyph_row && it->glyph_row->mode_line_p)
4914 || (it->c != '\n' && it->c != '\t'))) 4914 || (it->c != '\n' && it->c != '\t')))
4915 || (it->multibyte_p 4915 || (it->multibyte_p
4916 ? ((it->c >= 127 4916 ? ((it->c >= 127
4917 && it->len == 1) 4917 && it->len == 1)
4918 || !CHAR_PRINTABLE_P (it->c)) 4918 || !CHAR_PRINTABLE_P (it->c)
4919 || it->c == 0x8ad
4920 || it->c == 0x8a0)
4919 : (it->c >= 127 4921 : (it->c >= 127
4920 && (!unibyte_display_via_language_environment 4922 && (!unibyte_display_via_language_environment
4921 || it->c == unibyte_char_to_multibyte (it->c))))) 4923 || it->c == unibyte_char_to_multibyte (it->c)))))
4922 { 4924 {
4923 /* IT->c is a control character which must be displayed 4925 /* IT->c is a control character which must be displayed
4953 else 4955 else
4954 g = FAST_MAKE_GLYPH ('^', face_id); 4956 g = FAST_MAKE_GLYPH ('^', face_id);
4955 XSETINT (it->ctl_chars[0], g); 4957 XSETINT (it->ctl_chars[0], g);
4956 4958
4957 g = FAST_MAKE_GLYPH (it->c ^ 0100, face_id); 4959 g = FAST_MAKE_GLYPH (it->c ^ 0100, face_id);
4960 XSETINT (it->ctl_chars[1], g);
4961 ctl_len = 2;
4962 }
4963 else if (it->c == 0x8a0 || it->c == 0x8ad)
4964 {
4965 /* Set IT->ctl_chars[0] to the glyph for `\\'. */
4966 if (it->dp
4967 && INTEGERP (DISP_ESCAPE_GLYPH (it->dp))
4968 && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (it->dp))))
4969 g = XINT (DISP_ESCAPE_GLYPH (it->dp));
4970 else
4971 g = FAST_MAKE_GLYPH ('\\', face_id);
4972 XSETINT (it->ctl_chars[0], g);
4973
4974 g = FAST_MAKE_GLYPH (it->c == 0x8ad ? '-' : ' ', face_id);
4958 XSETINT (it->ctl_chars[1], g); 4975 XSETINT (it->ctl_chars[1], g);
4959 ctl_len = 2; 4976 ctl_len = 2;
4960 } 4977 }
4961 else 4978 else
4962 { 4979 {