[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/text-index 489ff0d129d 1/2: textconv.c: Adjust calls to `build_m
From: |
Stefan Monnier |
Subject: |
scratch/text-index 489ff0d129d 1/2: textconv.c: Adjust calls to `build_marker` |
Date: |
Tue, 22 Apr 2025 14:12:16 -0400 (EDT) |
branch: scratch/text-index
commit 489ff0d129d342af795c8aefbefbb31d78eb261b
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
textconv.c: Adjust calls to `build_marker`
* src/textconv.c (record_buffer_change, really_set_composing_text)
(locate_and_save_position_in_field): Adjust calls to `build_marker`.
---
src/textconv.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/textconv.c b/src/textconv.c
index 105a8077072..45835defcdb 100644
--- a/src/textconv.c
+++ b/src/textconv.c
@@ -487,8 +487,7 @@ record_buffer_change (ptrdiff_t beg, ptrdiff_t end,
XSETBUFFER (buffer, current_buffer);
/* Make markers for both BEG and END. */
- beg_marker = build_marker (current_buffer, beg,
- CHAR_TO_BYTE (beg));
+ beg_marker = build_marker (current_buffer, beg);
/* If BEG and END are identical, make sure to keep the markers
eq. */
@@ -497,8 +496,7 @@ record_buffer_change (ptrdiff_t beg, ptrdiff_t end,
end_marker = beg_marker;
else
{
- end_marker = build_marker (current_buffer, end,
- CHAR_TO_BYTE (end));
+ end_marker = build_marker (current_buffer, end);
/* Otherwise, make sure the marker extends past inserted
text. */
@@ -869,9 +867,9 @@ really_set_composing_text (struct frame *f, ptrdiff_t
position,
/* Now set the markers which denote the composition region. */
f->conversion.compose_region_start
- = build_marker (current_buffer, PT, PT_BYTE);
+ = build_marker (current_buffer, PT);
f->conversion.compose_region_end
- = build_marker (current_buffer, PT, PT_BYTE);
+ = build_marker (current_buffer, PT);
Fset_marker_insertion_type (f->conversion.compose_region_end,
Qt);
@@ -1170,8 +1168,8 @@ locate_and_save_position_in_field (struct frame *f,
struct window *w,
}
else
{
- c1 = build_marker (current_buffer, beg, CHAR_TO_BYTE (beg));
- c2 = build_marker (current_buffer, end, CHAR_TO_BYTE (end));
+ c1 = build_marker (current_buffer, beg);
+ c2 = build_marker (current_buffer, end);
Fset_marker_insertion_type (c2, Qt);
f->conversion.field = Fcons (c1, Fcons (c2, window));
}