diff options
| author | Po Lu | 2024-04-23 15:59:06 +0800 |
|---|---|---|
| committer | Po Lu | 2024-04-23 15:59:06 +0800 |
| commit | 326437e6c8a6497b1a38d002b1d28e74678a07aa (patch) | |
| tree | cac94512026d6cb32c132c218298f0f31d0e63f4 /src | |
| parent | cd7456e00d719d32c203c71b4e23c98b0c4e1967 (diff) | |
| parent | d22c260cb7d43a27632750920f5238ed7947ae8d (diff) | |
| download | emacs-326437e6c8a6497b1a38d002b1d28e74678a07aa.tar.gz emacs-326437e6c8a6497b1a38d002b1d28e74678a07aa.zip | |
Merge remote-tracking branch 'savannah/master' into master-android-1
Diffstat (limited to 'src')
| -rw-r--r-- | src/sysdep.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index cf2985b4b89..07237885cb9 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -2037,10 +2037,10 @@ init_signals (void) | |||
| 2037 | main_thread_id = pthread_self (); | 2037 | main_thread_id = pthread_self (); |
| 2038 | #endif | 2038 | #endif |
| 2039 | 2039 | ||
| 2040 | /* Don't alter signal handlers if dumping. On some machines, | 2040 | /* Don't alter signal handlers if dumping with unexec. On some |
| 2041 | changing signal handlers sets static data that would make signals | 2041 | machines, changing signal handlers sets static data that would make |
| 2042 | fail to work right when the dumped Emacs is run. */ | 2042 | signals fail to work right when the dumped Emacs is run. */ |
| 2043 | if (will_dump_p ()) | 2043 | if (will_dump_with_unexec_p ()) |
| 2044 | return; | 2044 | return; |
| 2045 | 2045 | ||
| 2046 | sigfillset (&process_fatal_action.sa_mask); | 2046 | sigfillset (&process_fatal_action.sa_mask); |