diff options
| author | Po Lu <luangruo@yahoo.com> | 2022-05-12 14:55:41 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2022-05-12 14:56:32 +0800 |
| commit | a4a229dfff3ede3d083ba874a4119db501118063 (patch) | |
| tree | 5efab97f69f949b03771cb73713d670fd99f25e4 /src/emacs.c | |
| parent | 5743b74d4b2e06ace233d6b170f193a72633f218 (diff) | |
| download | emacs-a4a229dfff3ede3d083ba874a4119db501118063.tar.gz | |
Fix merging of anonymous faces with an `:extend' property on unexec
* src/emacs.c (main): Unconditionally call `init_xfaces'.
* src/lisp.h: Enable `init_xfaces' on unexec builds too.
* src/xfaces.c (init_xfaces): Move fix for bug#34226 into
pdumper-specific section leaving the initialization of
`face_attr_sym' intact.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/emacs.c b/src/emacs.c index ca99a8c787d..fe138366f3a 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1952,15 +1952,11 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem init_threads (); init_eval (); #ifdef HAVE_PGTK - init_pgtkterm (); /* before init_atimer(). */ + init_pgtkterm (); /* Must come before `init_atimer'. */ #endif running_asynch_code = 0; init_random (); - -#ifdef HAVE_PDUMPER - if (dumped_with_pdumper_p ()) - init_xfaces (); -#endif + init_xfaces (); #if defined HAVE_JSON && !defined WINDOWSNT init_json (); |