mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-27 07:41:28 -08:00
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.
This commit is contained in:
parent
b0abc50218
commit
a17380e80d
2 changed files with 18 additions and 2 deletions
|
|
@ -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 ();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue