diff options
| author | Po Lu | 2023-03-15 18:28:05 +0800 |
|---|---|---|
| committer | Po Lu | 2023-03-15 18:28:05 +0800 |
| commit | 3504c7550d9e2eeeabfe71b5819506ebc7c045b4 (patch) | |
| tree | 8ea6d0d53925fdb1d9b63c1663af625761c23437 /src | |
| parent | f57c64925bc16fa967a86ffe424396a395e448fb (diff) | |
| parent | fe58837bbec5181013b178684860f74e0379d965 (diff) | |
| download | emacs-3504c7550d9e2eeeabfe71b5819506ebc7c045b4.tar.gz emacs-3504c7550d9e2eeeabfe71b5819506ebc7c045b4.zip | |
Merge remote-tracking branch 'origin/master' into feature/android
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 3df98e6fae2..d75a83ab9d8 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -2024,7 +2024,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem | |||
| 2024 | /* Do less garbage collection in batch mode (since these tend to be | 2024 | /* Do less garbage collection in batch mode (since these tend to be |
| 2025 | more short-lived, and the memory is returned to the OS on exit | 2025 | more short-lived, and the memory is returned to the OS on exit |
| 2026 | anyway). */ | 2026 | anyway). */ |
| 2027 | Vgc_cons_percentage = make_float (noninteractive? 1.0: 0.1); | 2027 | Vgc_cons_percentage = make_float (noninteractive && initialized ? 1.0 : 0.1); |
| 2028 | 2028 | ||
| 2029 | no_loadup | 2029 | no_loadup |
| 2030 | = argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args); | 2030 | = argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args); |