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, 8 insertions, 1 deletions

diff --git a/src/sfntfont.c b/src/sfntfont.c
index e8e437072d9..ab92def0aff 100644
--- a/src/sfntfont.c
+++ b/src/sfntfont.c
@@ -482,7 +482,14 @@ sfnt_parse_languages (struct sfnt_meta_table *meta,
                              &map);
 
   if (!data)
-    return;
+    {
+      /* Fall back to the supported languages metadata.  */
+      data = sfnt_find_metadata (meta, SFNT_META_DATA_TAG_SLNG,
+                                 &map);
+
+      if (!data)
+        return;
+    }
 
   USE_SAFE_ALLOCA;