Update Android port

* java/org/gnu/emacs/EmacsOpenActivity.java (EmacsOpenActivity)
(onCancel): New function.
(displayFailureDialog): Handle dialog cancellation.
* src/sfntfont.c (sfnt_parse_languages): Look for SLNG tag if
DLNG is not present.

1 files changed, 10 insertions, 1 deletions

diff --git a/java/org/gnu/emacs/EmacsOpenActivity.java b/java/org/gnu/emacs/EmacsOpenActivity.java
index 51335ddb2dd..e8fb24d53d8 100644
--- a/java/org/gnu/emacs/EmacsOpenActivity.java
+++ b/java/org/gnu/emacs/EmacsOpenActivity.java
@@ -68,7 +68,8 @@ import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 
 public final class EmacsOpenActivity extends Activity
-  implements DialogInterface.OnClickListener
+  implements DialogInterface.OnClickListener,
+  DialogInterface.OnCancelListener
 {
   private static final String TAG = "EmacsOpenActivity";
 
@@ -121,6 +122,13 @@ public final class EmacsOpenActivity extends Activity
     finish ();
   }
 
+  @Override
+  public void
+  onCancel (DialogInterface dialog)
+  {
+    finish ();
+  }
+
   public String
   readEmacsClientLog ()
   {
@@ -178,6 +186,7 @@ public final class EmacsOpenActivity extends Activity
 
     dialog.setMessage (text);
     dialog.setButton (DialogInterface.BUTTON_POSITIVE, "OK", this);
+    dialog.setOnCancelListener (this);
     dialog.show ();
   }