diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-13 15:29:26 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-13 15:31:04 -0700 |
| commit | 4a0d8b4cadcfef8c39581031bd00b3175ca37b43 (patch) | |
| tree | 11d941293684a649b7765e2afe06edeff5a25d60 /src/term.c | |
| parent | 3988ceaa1cfa2022443906750cbb30127a1e161f (diff) | |
| download | emacs-4a0d8b4cadcfef8c39581031bd00b3175ca37b43.tar.gz emacs-4a0d8b4cadcfef8c39581031bd00b3175ca37b43.tar.bz2 emacs-4a0d8b4cadcfef8c39581031bd00b3175ca37b43.zip | |
Port to ISO/IEC TS 18661-1:2014
* src/character.h (CHARACTER_WIDTH): Rename from CHAR_WIDTH.
All uses changed.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/term.c b/src/term.c index 54a97e95b79..426674f4470 100644 --- a/src/term.c +++ b/src/term.c @@ -593,7 +593,7 @@ encode_terminal_code (struct glyph *src, int src_len, continue; if (char_charset (c, charset_list, NULL)) { - if (CHAR_WIDTH (c) == 0 + if (CHARACTER_WIDTH (c) == 0 && i > 0 && COMPOSITION_GLYPH (cmp, i - 1) == '\t') /* Should be left-padded */ { @@ -1626,7 +1626,7 @@ produce_glyphs (struct it *it) if (char_charset (it->char_to_display, charset_list, NULL)) { - it->pixel_width = CHAR_WIDTH (it->char_to_display); + it->pixel_width = CHARACTER_WIDTH (it->char_to_display); it->nglyphs = it->pixel_width; if (it->glyph_row) append_glyph (it); @@ -1832,7 +1832,7 @@ produce_glyphless_glyph (struct it *it, Lisp_Object acronym) } else if (it->glyphless_method == GLYPHLESS_DISPLAY_EMPTY_BOX) { - len = CHAR_WIDTH (it->c); + len = CHARACTER_WIDTH (it->c); if (len == 0) len = 1; else if (len > 4) |