From: Po Lu <luangruo@yahoo.com>
Date: Sun, 12 May 2024 13:42:52 +0000 (+0800)
Subject: Fix offset of reported conversion regions
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f64161692f2e71db6aa9fc46b429a3e368188bea;p=emacs.git

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.

(cherry picked from commit 6e8bee27a5cb9915c5db0f8756c8a903e4be1cec)
---

diff --git a/src/androidterm.c b/src/androidterm.c
index f4c071f4519..e1cd96c9176 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -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;
     }