diff options
| author | Stefan Kangas | 2023-12-10 13:22:04 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2023-12-10 13:22:04 +0100 |
| commit | 06a12b0cccbda419752f3388346be7d302ebcbeb (patch) | |
| tree | 69c3a4c23638553993a7580cae4a4d597fd8e258 /java | |
| parent | 1d5028ad0414cad458aac1102d3612e4956068c5 (diff) | |
| download | emacs-06a12b0cccbda419752f3388346be7d302ebcbeb.tar.gz emacs-06a12b0cccbda419752f3388346be7d302ebcbeb.zip | |
; Fix typos
Diffstat (limited to 'java')
| -rw-r--r-- | java/INSTALL | 4 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsContextMenu.java | 2 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsInputConnection.java | 2 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsOpenActivity.java | 2 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsSafThread.java | 6 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsService.java | 8 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsView.java | 2 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsWindow.java | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/java/INSTALL b/java/INSTALL index fb221c5e2b4..60171ada57c 100644 --- a/java/INSTALL +++ b/java/INSTALL | |||
| @@ -167,7 +167,7 @@ than a compressed package for a newer version of Android. | |||
| 167 | BUILDING C++ DEPENDENCIES | 167 | BUILDING C++ DEPENDENCIES |
| 168 | 168 | ||
| 169 | With a new version of the NDK, dependencies containing C++ code should | 169 | With a new version of the NDK, dependencies containing C++ code should |
| 170 | build without any futher configuration. However, older versions | 170 | build without any further configuration. However, older versions |
| 171 | require that you use the ``make_standalone_toolchain.py'' script in | 171 | require that you use the ``make_standalone_toolchain.py'' script in |
| 172 | the NDK distribution to create a ``standalone toolchain'', and use | 172 | the NDK distribution to create a ``standalone toolchain'', and use |
| 173 | that instead, in order for C++ headers to be found. | 173 | that instead, in order for C++ headers to be found. |
| @@ -309,7 +309,7 @@ work, along with what has to be patched to make them work: | |||
| 309 | Many of these dependencies have been migrated over to the | 309 | Many of these dependencies have been migrated over to the |
| 310 | ``Android.bp'' build system now used to build Android itself. | 310 | ``Android.bp'' build system now used to build Android itself. |
| 311 | However, the old ``Android.mk'' Makefiles are still present in older | 311 | However, the old ``Android.mk'' Makefiles are still present in older |
| 312 | branches, and can be easily adapte to newer versions. | 312 | branches, and can be easily adapted to newer versions. |
| 313 | 313 | ||
| 314 | In addition, some Emacs dependencies provide `ndk-build' support | 314 | In addition, some Emacs dependencies provide `ndk-build' support |
| 315 | themselves: | 315 | themselves: |
diff --git a/java/org/gnu/emacs/EmacsContextMenu.java b/java/org/gnu/emacs/EmacsContextMenu.java index c415ba59c79..2652f35b545 100644 --- a/java/org/gnu/emacs/EmacsContextMenu.java +++ b/java/org/gnu/emacs/EmacsContextMenu.java | |||
| @@ -36,7 +36,7 @@ import android.view.SubMenu; | |||
| 36 | import android.util.Log; | 36 | import android.util.Log; |
| 37 | 37 | ||
| 38 | /* Context menu implementation. This object is built from JNI and | 38 | /* Context menu implementation. This object is built from JNI and |
| 39 | describes a menu hiearchy. Then, `inflate' can turn it into an | 39 | describes a menu hierarchy. Then, `inflate' can turn it into an |
| 40 | Android menu, which can be turned into a popup (or other kind of) | 40 | Android menu, which can be turned into a popup (or other kind of) |
| 41 | menu. */ | 41 | menu. */ |
| 42 | 42 | ||
diff --git a/java/org/gnu/emacs/EmacsInputConnection.java b/java/org/gnu/emacs/EmacsInputConnection.java index 7f6331205cb..4b493dcc456 100644 --- a/java/org/gnu/emacs/EmacsInputConnection.java +++ b/java/org/gnu/emacs/EmacsInputConnection.java | |||
| @@ -60,7 +60,7 @@ public final class EmacsInputConnection implements InputConnection | |||
| 60 | 60 | ||
| 61 | This helps with on screen keyboard programs found in some vendor | 61 | This helps with on screen keyboard programs found in some vendor |
| 62 | versions of Android, which rely on immediate updates to the point | 62 | versions of Android, which rely on immediate updates to the point |
| 63 | position after text is commited in order to place the cursor | 63 | position after text is committed in order to place the cursor |
| 64 | within that text. */ | 64 | within that text. */ |
| 65 | 65 | ||
| 66 | private static boolean syncAfterCommit; | 66 | private static boolean syncAfterCommit; |
diff --git a/java/org/gnu/emacs/EmacsOpenActivity.java b/java/org/gnu/emacs/EmacsOpenActivity.java index 32a79d1a797..b4fd68146be 100644 --- a/java/org/gnu/emacs/EmacsOpenActivity.java +++ b/java/org/gnu/emacs/EmacsOpenActivity.java | |||
| @@ -636,7 +636,7 @@ public final class EmacsOpenActivity extends Activity | |||
| 636 | { | 636 | { |
| 637 | /* This means Emacs lacks the rights to open this | 637 | /* This means Emacs lacks the rights to open this |
| 638 | file. Display the error message and exit. */ | 638 | file. Display the error message and exit. */ |
| 639 | displayFailureDialog ("Error openining file", | 639 | displayFailureDialog ("Error opening file", |
| 640 | exception.toString ()); | 640 | exception.toString ()); |
| 641 | return; | 641 | return; |
| 642 | } | 642 | } |
diff --git a/java/org/gnu/emacs/EmacsSafThread.java b/java/org/gnu/emacs/EmacsSafThread.java index 7917e2d4880..8bb84126b07 100644 --- a/java/org/gnu/emacs/EmacsSafThread.java +++ b/java/org/gnu/emacs/EmacsSafThread.java | |||
| @@ -767,7 +767,7 @@ public final class EmacsSafThread extends HandlerThread | |||
| 767 | 767 | ||
| 768 | private abstract class SafIntFunction | 768 | private abstract class SafIntFunction |
| 769 | { | 769 | { |
| 770 | /* The ``throws Throwable'' here is a Java idiosyncracy that tells | 770 | /* The ``throws Throwable'' here is a Java idiosyncrasy that tells |
| 771 | the compiler to allow arbitrary error objects to be signaled | 771 | the compiler to allow arbitrary error objects to be signaled |
| 772 | from within this function. | 772 | from within this function. |
| 773 | 773 | ||
| @@ -782,7 +782,7 @@ public final class EmacsSafThread extends HandlerThread | |||
| 782 | 782 | ||
| 783 | private abstract class SafObjectFunction | 783 | private abstract class SafObjectFunction |
| 784 | { | 784 | { |
| 785 | /* The ``throws Throwable'' here is a Java idiosyncracy that tells | 785 | /* The ``throws Throwable'' here is a Java idiosyncrasy that tells |
| 786 | the compiler to allow arbitrary error objects to be signaled | 786 | the compiler to allow arbitrary error objects to be signaled |
| 787 | from within this function. | 787 | from within this function. |
| 788 | 788 | ||
| @@ -1216,7 +1216,7 @@ public final class EmacsSafThread extends HandlerThread | |||
| 1216 | }); | 1216 | }); |
| 1217 | } | 1217 | } |
| 1218 | 1218 | ||
| 1219 | /* The bulk of `statDocument'. SIGNAL should be a cancelation | 1219 | /* The bulk of `statDocument'. SIGNAL should be a cancellation |
| 1220 | signal. */ | 1220 | signal. */ |
| 1221 | 1221 | ||
| 1222 | private long[] | 1222 | private long[] |
diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java index 33832505333..c71670b3e47 100644 --- a/java/org/gnu/emacs/EmacsService.java +++ b/java/org/gnu/emacs/EmacsService.java | |||
| @@ -612,7 +612,7 @@ public final class EmacsService extends Service | |||
| 612 | context.startService (new Intent (context, | 612 | context.startService (new Intent (context, |
| 613 | EmacsService.class)); | 613 | EmacsService.class)); |
| 614 | else | 614 | else |
| 615 | /* Display the permanant notification and start Emacs as a | 615 | /* Display the permanent notification and start Emacs as a |
| 616 | foreground service. */ | 616 | foreground service. */ |
| 617 | context.startForegroundService (new Intent (context, | 617 | context.startForegroundService (new Intent (context, |
| 618 | EmacsService.class)); | 618 | EmacsService.class)); |
| @@ -679,7 +679,7 @@ public final class EmacsService extends Service | |||
| 679 | /* Display a list of programs able to send this URL. */ | 679 | /* Display a list of programs able to send this URL. */ |
| 680 | intent = Intent.createChooser (intent, "Send"); | 680 | intent = Intent.createChooser (intent, "Send"); |
| 681 | 681 | ||
| 682 | /* Apparently flags need to be set after a choser is | 682 | /* Apparently flags need to be set after a chooser is |
| 683 | created. */ | 683 | created. */ |
| 684 | intent.addFlags (Intent.FLAG_ACTIVITY_NEW_TASK); | 684 | intent.addFlags (Intent.FLAG_ACTIVITY_NEW_TASK); |
| 685 | } | 685 | } |
| @@ -927,7 +927,7 @@ public final class EmacsService extends Service | |||
| 927 | 927 | ||
| 928 | if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) | 928 | if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) |
| 929 | /* Since the system predates drag and drop, return this resolver | 929 | /* Since the system predates drag and drop, return this resolver |
| 930 | to avoid any unforseen difficulties. */ | 930 | to avoid any unforeseen difficulties. */ |
| 931 | return resolver; | 931 | return resolver; |
| 932 | 932 | ||
| 933 | activity = EmacsActivity.lastFocusedActivity; | 933 | activity = EmacsActivity.lastFocusedActivity; |
| @@ -947,7 +947,7 @@ public final class EmacsService extends Service | |||
| 947 | 947 | ||
| 948 | if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) | 948 | if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) |
| 949 | /* Since the system predates drag and drop, return this resolver | 949 | /* Since the system predates drag and drop, return this resolver |
| 950 | to avoid any unforseen difficulties. */ | 950 | to avoid any unforeseen difficulties. */ |
| 951 | return this; | 951 | return this; |
| 952 | 952 | ||
| 953 | activity = EmacsActivity.lastFocusedActivity; | 953 | activity = EmacsActivity.lastFocusedActivity; |
diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java index 2d53231fbf9..5795f476f63 100644 --- a/java/org/gnu/emacs/EmacsView.java +++ b/java/org/gnu/emacs/EmacsView.java | |||
| @@ -388,7 +388,7 @@ public final class EmacsView extends ViewGroup | |||
| 388 | && !rootWindowInsets.isVisible (WindowInsets.Type.ime ()) | 388 | && !rootWindowInsets.isVisible (WindowInsets.Type.ime ()) |
| 389 | /* N.B. that the keyboard is dismissed during gesture | 389 | /* N.B. that the keyboard is dismissed during gesture |
| 390 | navigation under Android 30, but the system is | 390 | navigation under Android 30, but the system is |
| 391 | quite tempermental regarding whether the window is | 391 | quite temperamental regarding whether the window is |
| 392 | focused at that point. Ideally | 392 | focused at that point. Ideally |
| 393 | isCurrentlyTextEditor shouldn't be reset in that | 393 | isCurrentlyTextEditor shouldn't be reset in that |
| 394 | case, but detecting that situation appears to be | 394 | case, but detecting that situation appears to be |
diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java index 7d161fdcf88..2c446913eba 100644 --- a/java/org/gnu/emacs/EmacsWindow.java +++ b/java/org/gnu/emacs/EmacsWindow.java | |||
| @@ -1399,7 +1399,7 @@ public final class EmacsWindow extends EmacsHandleObject | |||
| 1399 | } | 1399 | } |
| 1400 | 1400 | ||
| 1401 | /* Effect the same adjustment upon the view | 1401 | /* Effect the same adjustment upon the view |
| 1402 | hiearchy. */ | 1402 | hierarchy. */ |
| 1403 | 1403 | ||
| 1404 | EmacsService.SERVICE.runOnUiThread (new Runnable () { | 1404 | EmacsService.SERVICE.runOnUiThread (new Runnable () { |
| 1405 | @Override | 1405 | @Override |