diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-15 15:25:33 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-15 15:55:30 -0700 |
| commit | 0bbf00c7f3de9c75372100afc3039d7f5c8a7587 (patch) | |
| tree | 79fccec02fc3a9ceb9e04c16ae2117f725910276 /src/indent.c | |
| parent | 8f4b6a20bfec96086845b2f7161e121b1e41b4ad (diff) | |
| download | emacs-0bbf00c7f3de9c75372100afc3039d7f5c8a7587.tar.gz | |
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/indent.c')
| -rw-r--r-- | src/indent.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/indent.c b/src/indent.c index cc5bf37f1df..b68b60297fd 100644 --- a/src/indent.c +++ b/src/indent.c @@ -1876,9 +1876,9 @@ vmotion (register ptrdiff_t from, register ptrdiff_t from_byte, } pos = *compute_motion (prevline, bytepos, 0, lmargin, 0, from, /* Don't care for VPOS... */ - 1 << (BITS_PER_SHORT - 1), + 1 << (SHRT_WIDTH - 1), /* ... nor HPOS. */ - 1 << (BITS_PER_SHORT - 1), + 1 << (SHRT_WIDTH - 1), -1, hscroll, 0, w); vpos -= pos.vpos; first = 0; @@ -1926,9 +1926,9 @@ vmotion (register ptrdiff_t from, register ptrdiff_t from_byte, } pos = *compute_motion (prevline, bytepos, 0, lmargin, 0, from, /* Don't care for VPOS... */ - 1 << (BITS_PER_SHORT - 1), + 1 << (SHRT_WIDTH - 1), /* ... nor HPOS. */ - 1 << (BITS_PER_SHORT - 1), + 1 << (SHRT_WIDTH - 1), -1, hscroll, 0, w); did_motion = 1; } @@ -1939,7 +1939,7 @@ vmotion (register ptrdiff_t from, register ptrdiff_t from_byte, did_motion = 0; } return compute_motion (from, from_byte, vpos, pos.hpos, did_motion, - ZV, vtarget, - (1 << (BITS_PER_SHORT - 1)), + ZV, vtarget, - (1 << (SHRT_WIDTH - 1)), -1, hscroll, 0, w); } |