Update Android port

* java/org/gnu/emacs/EmacsWindow.java (figureChange): Detect
mice on up events as well.
(onSomeKindOfMotionEvent): Work past framework bug.
* src/androidterm.c (android_perform_conversion_query):
* src/textconv.c (textconv_query):
* src/textconv.h (TEXTCONV_SKIP_ACTIVE_REGION): Remove unused
code.

3 files changed, 1 insertions, 38 deletions

diff --git a/src/androidterm.c b/src/androidterm.c
index 72d81744128..0110c4b6dd8 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -4685,8 +4685,6 @@ struct android_conversion_query_context
 /* Obtain the text from the frame whose window is that specified in
    DATA using the text conversion query specified there.
 
-   Adjust the query position to skip over any active composing region.
-
    Set ((struct android_conversion_query_context *) DATA)->success on
    success.  */
 
@@ -4704,7 +4702,7 @@ android_perform_conversion_query (void *data)
   if (!f)
     return;
 
-  textconv_query (f, &context->query, TEXTCONV_SKIP_ACTIVE_REGION);
+  textconv_query (f, &context->query, 0);
 
   /* context->query.text will have been set even if textconv_query
      returns 1.  */
diff --git a/src/textconv.c b/src/textconv.c
index 900277016f2..91f6e861c60 100644
--- a/src/textconv.c
+++ b/src/textconv.c
@@ -147,9 +147,6 @@ select_window (Lisp_Object window, Lisp_Object norecord)
    If FLAGS & TEXTCONV_SKIP_CONVERSION_REGION, then first move PT past
    the conversion region in the specified direction if it is inside.
 
-   If FLAGS & TEXTCONV_SKIP_ACTIVE_REGION, then also move PT past the
-   region if the mark is active.
-
    Value is 0 if QUERY->operation was not TEXTCONV_SUBSTITUTION
    or if deleting the text was successful, and 1 otherwise.  */
 
@@ -234,37 +231,6 @@ textconv_query (struct frame *f, struct textconv_callback_struct *query,
         }
     }
 
-  /* Likewise for the region if the mark is active.  */
-
-  if (flags & TEXTCONV_SKIP_ACTIVE_REGION)
-    {
-      temp = mark;
-
-      if (temp == -1)
-        goto escape;
-
-      start = min (temp, PT);
-      end = max (temp, PT);
-
-      if (pos >= start && pos < end)
-        {
-          switch (query->direction)
-            {
-            case TEXTCONV_FORWARD_CHAR:
-            case TEXTCONV_FORWARD_WORD:
-            case TEXTCONV_CARET_DOWN:
-            case TEXTCONV_NEXT_LINE:
-            case TEXTCONV_LINE_START:
-              pos = end;
-              break;
-
-            default:
-              pos = max (BEGV, start);
-              break;
-            }
-        }
-    }
-
  escape:
 
   /* If pos is outside the accessible part of the buffer or if it
diff --git a/src/textconv.h b/src/textconv.h
index 9bc9e7d9bd1..6abca97bc52 100644
--- a/src/textconv.h
+++ b/src/textconv.h
@@ -119,7 +119,6 @@ struct textconv_callback_struct
 };
 
 #define TEXTCONV_SKIP_CONVERSION_REGION (1 << 0)
-#define TEXTCONV_SKIP_ACTIVE_REGION     (1 << 1)
 
 extern int textconv_query (struct frame *, struct textconv_callback_struct *,
                            int);