mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Merge from savannah/emacs-30

Browse source 
4c35382e98 ; * src/emacs.c (syms_of_emacs) <Vsystem_type>: Fix doc s...
34882d5243 Port better to Android 3.0
765cfaed77 ; * doc/emacs/anti.texi (Antinews): Fix typos (bug#72167).
7093504da2 ; Fix typos (bug#72167)
8c7c4f4baa New Tramp tests
85d2d7982d Update Tramp manual
504bdd560a ; Fix last change
3ccebbe17b Fix 'toggle-window-dedicated' documentation
719d5753ca ; * doc/lispref/help.texi (Keys in Documentation): Add cr...
e3bba63ecb Checkdoc fixes in transient.el
This commit is contained in:
Po Lu 2024-07-18 13:36:46 +08:00
commit d31b202377
12 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
java/org/gnu/emacs/EmacsNoninteractive.java
View file

@ -120,11 +120,11 @@ public final class EmacsNoninteractive
}
/* Get a LoadedApk or ActivityThread.PackageInfo. How to do
this varies by Android version. On Android 2.3.3 and
earlier, there is no ``compatibilityInfo'' argument to
this varies by Android version. On Android 3.0 and earlier,
there is no ``compatibilityInfo'' argument to
getPackageInfo. */
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1)
try
{
method
= activityThreadClass.getMethod ("getPackageInfo",
@ -134,7 +134,7 @@ public final class EmacsNoninteractive
(Context.CONTEXT_INCLUDE_CODE
| Context.CONTEXT_IGNORE_SECURITY));
}
else
catch (NoSuchMethodException exception)
{
compatibilityInfoClass
= Class.forName ("android.content.res.CompatibilityInfo");