Update android_wc_lookup_string

* src/android.c (android_wc_lookup_string): Don't clear compose
state upon modifier key depress.

(cherry picked from commit cc75e103dd2a9d47f29addcc724812162c1a2626)

diff --git a/src/android.c b/src/android.c
index 5b3fbb25373f63164c85bf746a2297625b3d432c..d7bd06f1f34179282d71daf5bd8d215c891f4702 100644 (file)
--- a/src/android.c
+++ b/src/android.c
@@ -5535,7 +5535,10 @@ android_wc_lookup_string (android_key_pressed_event *event,
 
       /* Terminate any ongoing character composition after a key is
         registered.  */
-      if (compose_status)
+      if (compose_status
+         /* Provided that a modifier key is not the key being
+            depressed.  */
+         && !ANDROID_IS_MODIFIER_KEY (event->keycode))
        compose_status->chars_matched = 0;
       *status_return = status;
       return rc;