2 files changed, 6 insertions, 5 deletions

diff --git a/java/org/gnu/emacs/EmacsNative.java b/java/org/gnu/emacs/EmacsNative.java
index aaac9446510..ef1a0e75a5c 100644
--- a/java/org/gnu/emacs/EmacsNative.java
+++ b/java/org/gnu/emacs/EmacsNative.java
@@ -205,7 +205,7 @@ public class EmacsNative
 
   /* Return the current value of the selection, or -1 upon
      failure.  */
-  public static native int getSelection (short window);
+  public static native int[] getSelection (short window);
 
   static
   {
diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java
index 5ea8b0dcc0e..89f526853b2 100644
--- a/java/org/gnu/emacs/EmacsView.java
+++ b/java/org/gnu/emacs/EmacsView.java
@@ -555,7 +555,8 @@ public class EmacsView extends ViewGroup
   public InputConnection
   onCreateInputConnection (EditorInfo info)
   {
-    int selection, mode;
+    int mode;
+    int[] selection;
 
     /* Figure out what kind of IME behavior Emacs wants.  */
     mode = getICMode ();
@@ -575,7 +576,7 @@ public class EmacsView extends ViewGroup
 
     /* If this fails or ANDROID_IC_MODE_NULL was requested, then don't
        initialize the input connection.  */
-    if (selection == -1 || mode == EmacsService.IC_MODE_NULL)
+    if (mode == EmacsService.IC_MODE_NULL || selection == null)
       {
         info.inputType = InputType.TYPE_NULL;
         return null;
@@ -585,8 +586,8 @@ public class EmacsView extends ViewGroup
       info.imeOptions |= EditorInfo.IME_ACTION_DONE;
 
     /* Set the initial selection fields.  */
-    info.initialSelStart = selection;
-    info.initialSelEnd = selection;
+    info.initialSelStart = selection[0];
+    info.initialSelEnd = selection[1];
 
     /* Create the input connection if necessary.  */