diff options
| author | Paul Eggert | 2024-06-04 22:13:47 -0700 |
|---|---|---|
| committer | Paul Eggert | 2024-06-04 22:16:28 -0700 |
| commit | 3dcac22dd4225fdec0b97408da38f74de2a77bef (patch) | |
| tree | c79a8563efbed67aae0bba5d46b628c1e8a5b69b /java | |
| parent | 636461686f1d36388d4523cbb10eb7ec3bbbd63e (diff) | |
| download | emacs-3dcac22dd4225fdec0b97408da38f74de2a77bef.tar.gz emacs-3dcac22dd4225fdec0b97408da38f74de2a77bef.zip | |
Spelling fixes
Diffstat (limited to 'java')
| -rw-r--r-- | java/AndroidManifest.xml.in | 2 | ||||
| -rw-r--r-- | java/INSTALL | 2 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsDesktopNotification.java | 2 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsGC.java | 2 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsTileObject.java | 2 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsWindowManager.java | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in index ff811ddf3f1..644f154b53b 100644 --- a/java/AndroidManifest.xml.in +++ b/java/AndroidManifest.xml.in | |||
| @@ -20,7 +20,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. --> | |||
| 20 | <!-- targetSandboxVersion must be 1, for otherwise fascist security | 20 | <!-- targetSandboxVersion must be 1, for otherwise fascist security |
| 21 | restrictions prevent Emacs from making HTTP connections. | 21 | restrictions prevent Emacs from making HTTP connections. |
| 22 | 22 | ||
| 23 | Futhermore, versionCode should remain constant, rather than increase | 23 | Furthermore, versionCode should remain constant, rather than increase |
| 24 | with each major release, because it is impossible to downgrade an | 24 | with each major release, because it is impossible to downgrade an |
| 25 | installation with a greater value to an older version of Emacs. --> | 25 | installation with a greater value to an older version of Emacs. --> |
| 26 | 26 | ||
diff --git a/java/INSTALL b/java/INSTALL index 94bf0b01a96..a4cc97e7710 100644 --- a/java/INSTALL +++ b/java/INSTALL | |||
| @@ -170,7 +170,7 @@ In normal circumstances, Emacs should automatically detect and configure | |||
| 170 | one of the C++ standard libraries part of the NDK when such a library is | 170 | one of the C++ standard libraries part of the NDK when such a library is |
| 171 | required to build a dependency specified under `--with-ndk-path'. | 171 | required to build a dependency specified under `--with-ndk-path'. |
| 172 | 172 | ||
| 173 | Nevertheless, this process is not infalliable, and with certain versions | 173 | Nevertheless, this process is not infallible, and with certain versions |
| 174 | of the NDK is liable to fail to locate a C++ compiler, requiring that | 174 | of the NDK is liable to fail to locate a C++ compiler, requiring that |
| 175 | you run the `make_standalone_toolchain.py' script in the NDK | 175 | you run the `make_standalone_toolchain.py' script in the NDK |
| 176 | distribution to create a ``standalone toolchain'' and substitute the | 176 | distribution to create a ``standalone toolchain'' and substitute the |
diff --git a/java/org/gnu/emacs/EmacsDesktopNotification.java b/java/org/gnu/emacs/EmacsDesktopNotification.java index 72569631a8c..2bbfd867afa 100644 --- a/java/org/gnu/emacs/EmacsDesktopNotification.java +++ b/java/org/gnu/emacs/EmacsDesktopNotification.java | |||
| @@ -83,7 +83,7 @@ public final class EmacsDesktopNotification | |||
| 83 | notification. */ | 83 | notification. */ |
| 84 | public final String[] actions, titles; | 84 | public final String[] actions, titles; |
| 85 | 85 | ||
| 86 | /* Delay in miliseconds after which this notification should be | 86 | /* Delay in milliseconds after which this notification should be |
| 87 | automatically dismissed. */ | 87 | automatically dismissed. */ |
| 88 | public final long delay; | 88 | public final long delay; |
| 89 | 89 | ||
diff --git a/java/org/gnu/emacs/EmacsGC.java b/java/org/gnu/emacs/EmacsGC.java index d400c23e067..0b0f09c7ab9 100644 --- a/java/org/gnu/emacs/EmacsGC.java +++ b/java/org/gnu/emacs/EmacsGC.java | |||
| @@ -55,7 +55,7 @@ public final class EmacsGC extends EmacsHandleObject | |||
| 55 | public EmacsPixmap clip_mask, stipple; | 55 | public EmacsPixmap clip_mask, stipple; |
| 56 | public Paint gcPaint; | 56 | public Paint gcPaint; |
| 57 | 57 | ||
| 58 | /* Drawable object for rendering the stiple bitmap. */ | 58 | /* Drawable object for rendering the stipple bitmap. */ |
| 59 | public EmacsTileObject tileObject; | 59 | public EmacsTileObject tileObject; |
| 60 | 60 | ||
| 61 | /* ID incremented every time the clipping rectangles of any GC | 61 | /* ID incremented every time the clipping rectangles of any GC |
diff --git a/java/org/gnu/emacs/EmacsTileObject.java b/java/org/gnu/emacs/EmacsTileObject.java index a79ae826d51..93b09f5a8bc 100644 --- a/java/org/gnu/emacs/EmacsTileObject.java +++ b/java/org/gnu/emacs/EmacsTileObject.java | |||
| @@ -27,7 +27,7 @@ import android.graphics.Paint; | |||
| 27 | import android.graphics.Rect; | 27 | import android.graphics.Rect; |
| 28 | import android.graphics.Shader.TileMode; | 28 | import android.graphics.Shader.TileMode; |
| 29 | 29 | ||
| 30 | /* This is a crude facsimilie of the BitmapDrawable class implementing | 30 | /* This is a crude facsimile of the BitmapDrawable class implementing |
| 31 | just enough of its functionality to support displaying stipples in | 31 | just enough of its functionality to support displaying stipples in |
| 32 | EmacsGC. */ | 32 | EmacsGC. */ |
| 33 | 33 | ||
diff --git a/java/org/gnu/emacs/EmacsWindowManager.java b/java/org/gnu/emacs/EmacsWindowManager.java index 23dc71dbd29..03487e853fb 100644 --- a/java/org/gnu/emacs/EmacsWindowManager.java +++ b/java/org/gnu/emacs/EmacsWindowManager.java | |||
| @@ -137,7 +137,7 @@ public final class EmacsWindowManager | |||
| 137 | /* Don't attach this window to CONSUMER if incompatible. */ | 137 | /* Don't attach this window to CONSUMER if incompatible. */ |
| 138 | && isWindowEligible (consumer, window)) | 138 | && isWindowEligible (consumer, window)) |
| 139 | { | 139 | { |
| 140 | /* Permantly bind this window to the consumer. */ | 140 | /* Permanently bind this window to the consumer. */ |
| 141 | window.attachmentToken = consumer.getAttachmentToken (); | 141 | window.attachmentToken = consumer.getAttachmentToken (); |
| 142 | window.previouslyAttached = true; | 142 | window.previouslyAttached = true; |
| 143 | consumer.attachWindow (window); | 143 | consumer.attachWindow (window); |
| @@ -166,7 +166,7 @@ public final class EmacsWindowManager | |||
| 166 | if (consumer.getAttachedWindow () == null | 166 | if (consumer.getAttachedWindow () == null |
| 167 | && isWindowEligible (consumer, window)) | 167 | && isWindowEligible (consumer, window)) |
| 168 | { | 168 | { |
| 169 | /* Permantly bind this window to the consumer. */ | 169 | /* Permanently bind this window to the consumer. */ |
| 170 | window.attachmentToken = consumer.getAttachmentToken (); | 170 | window.attachmentToken = consumer.getAttachmentToken (); |
| 171 | window.previouslyAttached = true; | 171 | window.previouslyAttached = true; |
| 172 | consumer.attachWindow (window); | 172 | consumer.attachWindow (window); |
| @@ -186,7 +186,7 @@ public final class EmacsWindowManager | |||
| 186 | intent.addFlags (Intent.FLAG_ACTIVITY_NEW_TASK); | 186 | intent.addFlags (Intent.FLAG_ACTIVITY_NEW_TASK); |
| 187 | 187 | ||
| 188 | /* Intent.FLAG_ACTIVITY_NEW_DOCUMENT is lamentably unavailable on | 188 | /* Intent.FLAG_ACTIVITY_NEW_DOCUMENT is lamentably unavailable on |
| 189 | older systems than Lolipop. */ | 189 | older systems than Lollipop. */ |
| 190 | if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) | 190 | if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) |
| 191 | { | 191 | { |
| 192 | intent.addFlags (Intent.FLAG_ACTIVITY_NEW_DOCUMENT | 192 | intent.addFlags (Intent.FLAG_ACTIVITY_NEW_DOCUMENT |