diff options
| author | Richard M. Stallman | 2004-12-21 11:35:18 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2004-12-21 11:35:18 +0000 |
| commit | 6df99033c1ecff7d094f41ef91145cebfc5375f7 (patch) | |
| tree | 7f0f8957bbf099ab7dd3d665efff493c2bfe5982 /src | |
| parent | 85e7f4776aa861a7e1fe994a787987ea923a6936 (diff) | |
| download | emacs-6df99033c1ecff7d094f41ef91145cebfc5375f7.tar.gz emacs-6df99033c1ecff7d094f41ef91145cebfc5375f7.zip | |
(get_next_display_element): Display codes 8a0 and 8ad
specially as `\ ' and `\-'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index b27b5e2e744..2b97866592e 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -4915,7 +4915,9 @@ get_next_display_element (it) | |||
| 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))))) |
| @@ -4958,6 +4960,21 @@ get_next_display_element (it) | |||
| 4958 | XSETINT (it->ctl_chars[1], g); | 4960 | XSETINT (it->ctl_chars[1], g); |
| 4959 | ctl_len = 2; | 4961 | ctl_len = 2; |
| 4960 | } | 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); | ||
| 4975 | XSETINT (it->ctl_chars[1], g); | ||
| 4976 | ctl_len = 2; | ||
| 4977 | } | ||
| 4961 | else | 4978 | else |
| 4962 | { | 4979 | { |
| 4963 | unsigned char str[MAX_MULTIBYTE_LENGTH]; | 4980 | unsigned char str[MAX_MULTIBYTE_LENGTH]; |