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/textconv.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/textconv.c')
| -rw-r--r-- | src/textconv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/textconv.c b/src/textconv.c index e1a73e91397..26f351dc729 100644 --- a/src/textconv.c +++ b/src/textconv.c @@ -235,7 +235,7 @@ textconv_query (struct frame *f, struct textconv_callback_struct *query, overflows, move back to point or to the extremes of the accessible region. */ - if (INT_ADD_WRAPV (pos, query->position, &pos)) + if (ckd_add (&pos, pos, query->position)) pos = PT; escape1: @@ -257,7 +257,7 @@ textconv_query (struct frame *f, struct textconv_callback_struct *query, { case TEXTCONV_FORWARD_CHAR: /* Move forward by query->factor characters. */ - if (INT_ADD_WRAPV (pos, query->factor, &end) || end > ZV) + if (ckd_add (&end, pos, query->factor) || end > ZV) end = ZV; end_byte = CHAR_TO_BYTE (end); @@ -265,7 +265,7 @@ textconv_query (struct frame *f, struct textconv_callback_struct *query, case TEXTCONV_BACKWARD_CHAR: /* Move backward by query->factor characters. */ - if (INT_SUBTRACT_WRAPV (pos, query->factor, &end) || end < BEGV) + if (ckd_sub (&end, pos, query->factor) || end < BEGV) end = BEGV; end_byte = CHAR_TO_BYTE (end); |