diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-18 09:04:57 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-18 09:04:57 +0800 |
| commit | 074c0268fd32d6527e124cff386bb6b15cf90017 (patch) | |
| tree | 62111c3c70d46a738f15514e988a707409ca45f4 /src/xdisp.c | |
| parent | db48eff8cf4a88393c0209f663ca194ee37fa747 (diff) | |
| parent | 5ef169ed701fa4f850fdca5563cdd468207d5d4f (diff) | |
| download | emacs-feature/android.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/androidfeature/android
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 09b1cc616f2..09f2f31816e 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -602,8 +602,8 @@ fill_column_indicator_column (struct it *it, int char_width) if (RANGED_FIXNUMP (0, col, INT_MAX)) { int icol = XFIXNUM (col); - if (!INT_MULTIPLY_WRAPV (char_width, icol, &icol) - && !INT_ADD_WRAPV (it->lnum_pixel_width, icol, &icol)) + if (!ckd_mul (&icol, icol, char_width) + && !ckd_add (&icol, icol, it->lnum_pixel_width)) return icol; } } @@ -28318,9 +28318,8 @@ decode_mode_spec (struct window *w, register int c, int field_width, ptrdiff_t position; ptrdiff_t distance = (line_number_display_limit_width < 0 ? 0 - : INT_MULTIPLY_WRAPV (line_number_display_limit_width, - height * 2 + 30, - &distance) + : ckd_mul (&distance, line_number_display_limit_width, + height * 2 + 30) ? PTRDIFF_MAX : distance); if (startpos - distance > limit) |