martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Android port

Browse Source 
* doc/emacs/input.texi (On-Screen Keyboards): Document
`touch-screen-always-display'.
* doc/lispref/commands.texi (Misc Events): Improve documentation
of text conversion events.
* java/org/gnu/emacs/EmacsDialog.java (toAlertDialog, display1):
Reorder buttons to make more sense.
* lisp/elec-pair.el (electric-pair-analyze-conversion): New
function.
* lisp/simple.el (analyze-text-conversion): Improve integration
with electric pair modes.
* lisp/term.el (term-mode): Always display the onscreen
keyboard.
* lisp/touch-screen.el (touch-screen-display-keyboard)
(touch-screen-handle-point-up): Respect new options.
* src/textconv.c (really_set_composing_text): Stop widenining
unnecessarily.
(really_delete_surrounding_text): Really delete surrounding
text.  Give text conversion analyzers the buffer text.
(syms_of_textconv): Update doc string.
This commit is contained in:
Po Lu
2023-02-18 23:09:30 +08:00
parent fa1b27930e
commit a61f9cb77c
8 changed files with 124 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/org/gnu/emacs/EmacsDialog.java
View File

@@ -166,14 +166,14 @@ public class EmacsDialog implements DialogInterface.OnDismissListener
if (size >= 2)
{
button = buttons.get (1);
dialog.setButton (DialogInterface.BUTTON_NEUTRAL,
dialog.setButton (DialogInterface.BUTTON_NEGATIVE,
button.name, button);
}
if (size >= 3)
{
button = buttons.get (2);
dialog.setButton (DialogInterface.BUTTON_NEGATIVE,
dialog.setButton (DialogInterface.BUTTON_NEUTRAL,
button.name, button);
}
}
@@ -274,10 +274,8 @@ public class EmacsDialog implements DialogInterface.OnDismissListener
if (size >= 2)
{
button = buttons.get (1);
dialog.setButton (DialogInterface.BUTTON_NEUTRAL,
button.name, button);
buttonView
= dialog.getButton (DialogInterface.BUTTON_NEUTRAL);
= dialog.getButton (DialogInterface.BUTTON_NEGATIVE);
buttonView.setEnabled (button.enabled);
}
@@ -285,7 +283,7 @@ public class EmacsDialog implements DialogInterface.OnDismissListener
{
button = buttons.get (2);
buttonView
= dialog.getButton (DialogInterface.BUTTON_NEGATIVE);
= dialog.getButton (DialogInterface.BUTTON_NEUTRAL);
buttonView.setEnabled (button.enabled);
}
}