From: Po Lu <luangruo@yahoo.com>
Date: Wed, 8 Feb 2023 14:51:43 +0000 (+0800)
Subject: Update Android port
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6de4deb47ea78f9e12182ea851c784d310759b53;p=emacs.git

Update Android port

* doc/emacs/android.texi (Android Startup): Fix typos.
* src/sfnt.c (sfnt_interpret_msirp): Fix order in which operands
to MSIRP are popped.
(main): Reduce ppem values.
---

diff --git a/doc/emacs/android.texi b/doc/emacs/android.texi
index b1f01057a98..5fdf5c16b4e 100644
--- a/doc/emacs/android.texi
+++ b/doc/emacs/android.texi
@@ -110,16 +110,17 @@ the Emacs files directory can be erased through the same preferences
 screen.
 
 @cindex emacsclient wrapper, android
-  Since there is no other way to start the @cmd{emacsclient} program
-(@pxref{Emacs Server}) from another Android program, Emacs provides a
-wrapper around the @cmd{emacsclient} program, which is registered with
-the system as an application that can open all text files.
+  Since there is no other way to start the @command{emacsclient}
+program (@pxref{Emacs Server}) from another Android program, Emacs
+provides a wrapper around the @command{emacsclient} program, which is
+registered with the system as an application that can open all text
+files.
 
   When that wrapper is selected as the program with which to open a
-file, it invokes @cmd{emacsclient} with the options
-@cmd{--reuse-frame}, @cmd{--timeout=10}, @cmd{--no-wait}, and the name
-of the file being opened.  Then, upon success, the focus is
-transferred to any open Emacs frame.
+file, it invokes @command{emacsclient} with the options
+@command{--reuse-frame}, @command{--timeout=10}, @command{--no-wait},
+and the name of the file being opened.  Then, upon success, the focus
+is transferred to any open Emacs frame.
 
 It is sadly impossible to open certain kinds of files which are
 provided by a ``content provider''.  When that is the case, a dialog
diff --git a/src/sfnt.c b/src/sfnt.c
index 8dc189919b7..882df102109 100644
--- a/src/sfnt.c
+++ b/src/sfnt.c
@@ -7887,7 +7887,7 @@ sfnt_measure_distance (struct sfnt_interpreter *interpreter,
 
 static void
 sfnt_interpret_msirp (struct sfnt_interpreter *interpreter,
-		      uint32_t p, sfnt_f26dot6 d, unsigned char opcode)
+		      sfnt_f26dot6 d, uint32_t p, unsigned char opcode)
 {
   sfnt_f26dot6 rp0x, rp0y, rp0_original_x, rp0_original_y;
   sfnt_f26dot6 x, y;
@@ -14718,8 +14718,8 @@ main (int argc, char **argv)
 		 data[i]->format);
     }
 
-#define FANCY_PPEM 30
-#define EASY_PPEM  30
+#define FANCY_PPEM 20
+#define EASY_PPEM  20
 
   interpreter = NULL;
   head = sfnt_read_head_table (fd, font);