diff options
| author | Yuan Fu <casouri@gmail.com> | 2022-11-21 12:54:35 -0800 |
|---|---|---|
| committer | Yuan Fu <casouri@gmail.com> | 2022-11-21 12:54:35 -0800 |
| commit | aaeaa310f0391f5a5193e1a3d6e026986c4f2c0c (patch) | |
| tree | 67765b95359bfc462e95606043e6b0cea3bb7c49 /src/emacs.c | |
| parent | b2ea38ab03e801859163b74a292aa75008e36541 (diff) | |
| parent | f176a36f4629b56c9fd9e3fc15aebd04a168c4f5 (diff) | |
| download | emacs-aaeaa310f0391f5a5193e1a3d6e026986c4f2c0c.tar.gz | |
Merge remote-tracking branch 'savannah/master' into feature/tree-sitter
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/emacs.c b/src/emacs.c index ed21cce1e25..105539aa192 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -82,6 +82,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ #endif /* HAVE_WINDOW_SYSTEM */ #include "bignum.h" +#include "itree.h" #include "intervals.h" #include "character.h" #include "buffer.h" @@ -435,9 +436,9 @@ terminate_due_to_signal (int sig, int backtrace_limit) if (sig == SIGTERM || sig == SIGHUP || sig == SIGINT) { /* Avoid abort in shut_down_emacs if we were interrupted - by SIGINT in noninteractive usage, as in that case we - don't care about the message stack. */ - if (sig == SIGINT && noninteractive) + in noninteractive usage, as in that case we don't + care about the message stack. */ + if (noninteractive) clear_message_stack (); Fkill_emacs (make_fixnum (sig), Qnil); } @@ -2570,6 +2571,7 @@ static const struct standard_args standard_args[] = { "-init-directory", "--init-directory", 30, 1 }, { "-no-x-resources", "--no-x-resources", 40, 0 }, { "-no-site-file", "--no-site-file", 40, 0 }, + { "-no-comp-spawn", "--no-comp-spawn", 60, 0 }, { "-u", "--user", 30, 1 }, { "-user", 0, 30, 1 }, { "-debug-init", "--debug-init", 20, 0 }, |