Update Android port

* 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.

1 files changed, 4 insertions, 6 deletions

diff --git a/java/org/gnu/emacs/EmacsDialog.java b/java/org/gnu/emacs/EmacsDialog.java
index bc0333e99b9..9f9124ce99c 100644
--- a/java/org/gnu/emacs/EmacsDialog.java
+++ b/java/org/gnu/emacs/EmacsDialog.java
@@ -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);
 	  }
       }