Fix offset of reported conversion regions

* src/androidterm.c (request_class, text_class): Pacify new
warning.
(android_update_selection): Don't redundantly subtract 1 from
compose region start.
This commit is contained in:
Po Lu 2024-05-12 21:42:52 +08:00
parent 9d7b22fcb4
commit 6e8bee27a5

View file

@ -5707,10 +5707,10 @@ struct android_extracted_text_class
/* Fields and methods associated with the `ExtractedTextRequest'
class. */
struct android_extracted_text_request_class request_class;
static struct android_extracted_text_request_class request_class;
/* Fields and methods associated with the `ExtractedText' class. */
struct android_extracted_text_class text_class;
static struct android_extracted_text_class text_class;
/* Return an ExtractedText object corresponding to the extracted text
TEXT. START is a character position describing the offset of the
@ -6273,8 +6273,8 @@ android_update_selection (struct frame *f, struct window *w)
end = marker_position (f->conversion.compose_region_end);
/* Offset and detect underflow. */
start = max (start, field_start) - field_start - 1;
end = min (end, field_end) - field_start - 1;
start = max (start, field_start) - field_start;
end = min (end, field_end) - field_start;
if (end < 0 || start < 0)
end = start = -1;
}