aboutsummaryrefslogtreecommitdiffstats
path: root/src/term.c
diff options
context:
space:
mode:
authorPaul Eggert2016-09-15 15:25:33 -0700
committerPaul Eggert2016-09-15 15:55:30 -0700
commit0bbf00c7f3de9c75372100afc3039d7f5c8a7587 (patch)
tree79fccec02fc3a9ceb9e04c16ae2117f725910276 /src/term.c
parent8f4b6a20bfec96086845b2f7161e121b1e41b4ad (diff)
downloademacs-0bbf00c7f3de9c75372100afc3039d7f5c8a7587.tar.gz
emacs-0bbf00c7f3de9c75372100afc3039d7f5c8a7587.zip
Prefer now-standard int width macros
* src/data.c (ULL_WIDTH): * src/lisp.h (EMACS_INT_WIDTH, BITS_PER_BITS_WORD): * src/lread.c (read_integer): * src/term.c (produce_glyphless_glyph): * src/xterm.c (x_send_scroll_bar_event): Use *_WIDTH macros instead of CHAR_BIT * sizeof. * src/data.c (ULL_WIDTH): Rename from BITS_PER_ULL for consistency with the *_WIDTH standard macros. All uses changed. * src/gmalloc.c (INT_BIT): Remove. All uses replaced with INT_WIDTH. * src/lisp.h (EMACS_INT_WIDTH): Rename from BITS_PER_EMACS_INT for consistency with the *_WIDTH standard macros. All uses changed. (BITS_PER_CHAR): Remove; all uses replaced by CHAR_BIT. This must be the same as CHAR_WIDTH and avoids confusion with Elisp char-width, which counts columns not bits. (BITS_PER_SHORT): Remove; all uses replaced by SHRT_WIDTH. (BITS_PER_LONG): Remove; all uses replaced by LONG_WIDTH. * src/lread.c: Do not include limits.h since CHAR_BIT is no longer used directly.
Diffstat (limited to 'src/term.c')
-rw-r--r--src/term.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c
index 426674f4470..c22d07ac579 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1821,7 +1821,7 @@ static void
1821produce_glyphless_glyph (struct it *it, Lisp_Object acronym) 1821produce_glyphless_glyph (struct it *it, Lisp_Object acronym)
1822{ 1822{
1823 int len, face_id = merge_glyphless_glyph_face (it); 1823 int len, face_id = merge_glyphless_glyph_face (it);
1824 char buf[sizeof "\\x" + max (6, (sizeof it->c * CHAR_BIT + 3) / 4)]; 1824 char buf[sizeof "\\x" + max (6, (INT_WIDTH + 3) / 4)];
1825 char const *str = " "; 1825 char const *str = " ";
1826 1826
1827 if (it->glyphless_method == GLYPHLESS_DISPLAY_THIN_SPACE) 1827 if (it->glyphless_method == GLYPHLESS_DISPLAY_THIN_SPACE)