diff options
| author | Po Lu | 2024-07-18 13:36:46 +0800 |
|---|---|---|
| committer | Po Lu | 2024-07-18 13:36:46 +0800 |
| commit | d31b202377ed844c1ecc405ffb879c03d5552d6b (patch) | |
| tree | dc34f4f588ac8409ce877d4ca420b868cbbf99ec /src | |
| parent | 3a790abd869ddadc343710deb0c4368227ba6611 (diff) | |
| parent | 4c35382e98308843dce79438844fb5a796b7032b (diff) | |
| download | emacs-d31b202377ed844c1ecc405ffb879c03d5552d6b.tar.gz emacs-d31b202377ed844c1ecc405ffb879c03d5552d6b.zip | |
Merge from savannah/emacs-30
4c35382e983 ; * src/emacs.c (syms_of_emacs) <Vsystem_type>: Fix doc s...
34882d52432 Port better to Android 3.0
765cfaed775 ; * doc/emacs/anti.texi (Antinews): Fix typos (bug#72167).
7093504da2d ; Fix typos (bug#72167)
8c7c4f4baaa New Tramp tests
85d2d7982d4 Update Tramp manual
504bdd560af ; Fix last change
3ccebbe17b7 Fix 'toggle-window-dedicated' documentation
719d5753ca6 ; * doc/lispref/help.texi (Keys in Documentation): Add cr...
e3bba63ecb9 Checkdoc fixes in transient.el
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c index c85beede992..37c8b28fc2c 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -3590,7 +3590,7 @@ Special values: | |||
| 3590 | `windows-nt' compiled as a native W32 application. | 3590 | `windows-nt' compiled as a native W32 application. |
| 3591 | `cygwin' compiled using the Cygwin library. | 3591 | `cygwin' compiled using the Cygwin library. |
| 3592 | `haiku' compiled for a Haiku system. | 3592 | `haiku' compiled for a Haiku system. |
| 3593 | `android' compiled for Android. | 3593 | `android' compiled for Android. |
| 3594 | Anything else (in Emacs 26, the possibilities are: aix, berkeley-unix, | 3594 | Anything else (in Emacs 26, the possibilities are: aix, berkeley-unix, |
| 3595 | hpux, usg-unix-v) indicates some sort of Unix system. */); | 3595 | hpux, usg-unix-v) indicates some sort of Unix system. */); |
| 3596 | Vsystem_type = intern_c_string (SYSTEM_TYPE); | 3596 | Vsystem_type = intern_c_string (SYSTEM_TYPE); |