Update Android port

* doc/emacs/input.texi (On-Screen Keyboards): Document changes
to text conversion.
* java/org/gnu/emacs/EmacsInputConnection.java (getExtractedText)
(EmacsInputConnection):
* src/keyboard.c (read_key_sequence): Disable text conversion
after reading prefix key.
* src/textconv.c (get_extracted_text): Fix returned value when
request length is zero.

2 files changed, 26 insertions, 0 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 9532eb70f06..69fb8ae2797 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10053,6 +10053,13 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt,
   /* Gets around Microsoft compiler limitations.  */
   bool dummyflag = false;
 
+#ifdef HAVE_TEXT_CONVERSION
+  bool disabled_conversion;
+
+  /* Whether or not text conversion has already been disabled.  */
+  disabled_conversion = false;
+#endif
+
   struct buffer *starting_buffer;
 
   /* List of events for which a fake prefix key has been generated.  */
@@ -10202,6 +10209,22 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt,
         echo_local_start = echo_length ();
       keys_local_start = this_command_key_count;
 
+#ifdef HAVE_TEXT_CONVERSION
+      /* When reading a key sequence while text conversion is in
+         effect, turn it off after the first character read.  This
+         makes input methods send actual key events instead.
+
+         Make sure only to do this once.  */
+
+      if (!disabled_conversion && t)
+        {
+          disable_text_conversion ();
+          record_unwind_protect_void (resume_text_conversion);
+
+          disabled_conversion = true;
+        }
+#endif
+
     replay_key:
       /* These are no-ops, unless we throw away a keystroke below and
          jumped back up to replay_key; in that case, these restore the
diff --git a/src/textconv.c b/src/textconv.c
index 1ca5f0488f8..4b5f9e01162 100644
--- a/src/textconv.c
+++ b/src/textconv.c
@@ -1462,6 +1462,9 @@ get_extracted_text (struct frame *f, ptrdiff_t n,
   /* Figure out the bounds of the text to return.  */
   if (n != -1)
     {
+      /* Make sure n is at least 2.  */
+      n = max (2, n);
+
       start = PT - n / 2;
       end = PT + n - n / 2;
     }