summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2023-12-10 13:22:04 +0100
committerStefan Kangas <stefankangas@gmail.com>2023-12-10 13:22:04 +0100
commit06a12b0cccbda419752f3388346be7d302ebcbeb (patch)
tree69c3a4c23638553993a7580cae4a4d597fd8e258 /java
parent1d5028ad0414cad458aac1102d3612e4956068c5 (diff)
downloademacs-06a12b0cccbda419752f3388346be7d302ebcbeb.tar.gz
; Fix typos
Diffstat (limited to 'java')
-rw-r--r--java/INSTALL4
-rw-r--r--java/org/gnu/emacs/EmacsContextMenu.java2
-rw-r--r--java/org/gnu/emacs/EmacsInputConnection.java2
-rw-r--r--java/org/gnu/emacs/EmacsOpenActivity.java2
-rw-r--r--java/org/gnu/emacs/EmacsSafThread.java6
-rw-r--r--java/org/gnu/emacs/EmacsService.java8
-rw-r--r--java/org/gnu/emacs/EmacsView.java2
-rw-r--r--java/org/gnu/emacs/EmacsWindow.java2
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.
BUILDING C++ DEPENDENCIES
With a new version of the NDK, dependencies containing C++ code should
-build without any futher configuration. However, older versions
+build without any further configuration. However, older versions
require that you use the ``make_standalone_toolchain.py'' script in
the NDK distribution to create a ``standalone toolchain'', and use
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:
Many of these dependencies have been migrated over to the
``Android.bp'' build system now used to build Android itself.
However, the old ``Android.mk'' Makefiles are still present in older
-branches, and can be easily adapte to newer versions.
+branches, and can be easily adapted to newer versions.
In addition, some Emacs dependencies provide `ndk-build' support
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;
import android.util.Log;
/* Context menu implementation. This object is built from JNI and
- describes a menu hiearchy. Then, `inflate' can turn it into an
+ describes a menu hierarchy. Then, `inflate' can turn it into an
Android menu, which can be turned into a popup (or other kind of)
menu. */
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
This helps with on screen keyboard programs found in some vendor
versions of Android, which rely on immediate updates to the point
- position after text is commited in order to place the cursor
+ position after text is committed in order to place the cursor
within that text. */
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
{
/* This means Emacs lacks the rights to open this
file. Display the error message and exit. */
- displayFailureDialog ("Error openining file",
+ displayFailureDialog ("Error opening file",
exception.toString ());
return;
}
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
private abstract class SafIntFunction
{
- /* The ``throws Throwable'' here is a Java idiosyncracy that tells
+ /* The ``throws Throwable'' here is a Java idiosyncrasy that tells
the compiler to allow arbitrary error objects to be signaled
from within this function.
@@ -782,7 +782,7 @@ public final class EmacsSafThread extends HandlerThread
private abstract class SafObjectFunction
{
- /* The ``throws Throwable'' here is a Java idiosyncracy that tells
+ /* The ``throws Throwable'' here is a Java idiosyncrasy that tells
the compiler to allow arbitrary error objects to be signaled
from within this function.
@@ -1216,7 +1216,7 @@ public final class EmacsSafThread extends HandlerThread
});
}
- /* The bulk of `statDocument'. SIGNAL should be a cancelation
+ /* The bulk of `statDocument'. SIGNAL should be a cancellation
signal. */
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
context.startService (new Intent (context,
EmacsService.class));
else
- /* Display the permanant notification and start Emacs as a
+ /* Display the permanent notification and start Emacs as a
foreground service. */
context.startForegroundService (new Intent (context,
EmacsService.class));
@@ -679,7 +679,7 @@ public final class EmacsService extends Service
/* Display a list of programs able to send this URL. */
intent = Intent.createChooser (intent, "Send");
- /* Apparently flags need to be set after a choser is
+ /* Apparently flags need to be set after a chooser is
created. */
intent.addFlags (Intent.FLAG_ACTIVITY_NEW_TASK);
}
@@ -927,7 +927,7 @@ public final class EmacsService extends Service
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
/* Since the system predates drag and drop, return this resolver
- to avoid any unforseen difficulties. */
+ to avoid any unforeseen difficulties. */
return resolver;
activity = EmacsActivity.lastFocusedActivity;
@@ -947,7 +947,7 @@ public final class EmacsService extends Service
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
/* Since the system predates drag and drop, return this resolver
- to avoid any unforseen difficulties. */
+ to avoid any unforeseen difficulties. */
return this;
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
&& !rootWindowInsets.isVisible (WindowInsets.Type.ime ())
/* N.B. that the keyboard is dismissed during gesture
navigation under Android 30, but the system is
- quite tempermental regarding whether the window is
+ quite temperamental regarding whether the window is
focused at that point. Ideally
isCurrentlyTextEditor shouldn't be reset in that
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
}
/* Effect the same adjustment upon the view
- hiearchy. */
+ hierarchy. */
EmacsService.SERVICE.runOnUiThread (new Runnable () {
@Override