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/xfaces.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/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 05e0df4b7dc..7395ce157ec 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6871,7 +6871,6 @@ DEFUN ("show-face-resources", Fshow_face_resources, Sshow_face_resources, Initialization ***********************************************************************/ -#ifdef HAVE_PDUMPER /* All the faces defined during loadup are recorded in face-new-frame-defaults. We need to set next_lface_id to the next face ID number, so that any new faces defined in this session will @@ -6881,26 +6880,35 @@ DEFUN ("show-face-resources", Fshow_face_resources, Sshow_face_resources, void init_xfaces (void) { - int nfaces = XFIXNAT (Fhash_table_count (Vface_new_frame_defaults)); - if (nfaces > 0) - { - /* Allocate the lface_id_to_name[] array. */ - lface_id_to_name_size = next_lface_id = nfaces; - lface_id_to_name = xnmalloc (next_lface_id, sizeof *lface_id_to_name); +#ifdef HAVE_PDUMPER + int nfaces; - /* Store the faces. */ - struct Lisp_Hash_Table* table = XHASH_TABLE (Vface_new_frame_defaults); - for (ptrdiff_t idx = 0; idx < nfaces; ++idx) + if (dumped_with_pdumper_p ()) + { + nfaces = XFIXNAT (Fhash_table_count (Vface_new_frame_defaults)); + if (nfaces > 0) { - Lisp_Object lface = HASH_KEY (table, idx); - Lisp_Object face_id = CAR (HASH_VALUE (table, idx)); - if (FIXNATP (face_id)) { - int id = XFIXNAT (face_id); - eassert (id >= 0); - lface_id_to_name[id] = lface; - } + /* Allocate the lface_id_to_name[] array. */ + lface_id_to_name_size = next_lface_id = nfaces; + lface_id_to_name = xnmalloc (next_lface_id, sizeof *lface_id_to_name); + + /* Store the faces. */ + struct Lisp_Hash_Table* table = XHASH_TABLE (Vface_new_frame_defaults); + for (ptrdiff_t idx = 0; idx < nfaces; ++idx) + { + Lisp_Object lface = HASH_KEY (table, idx); + Lisp_Object face_id = CAR (HASH_VALUE (table, idx)); + if (FIXNATP (face_id)) + { + int id = XFIXNAT (face_id); + eassert (id >= 0); + lface_id_to_name[id] = lface; + } + } } } +#endif + face_attr_sym[0] = Qface; face_attr_sym[LFACE_FOUNDRY_INDEX] = QCfoundry; face_attr_sym[LFACE_SWIDTH_INDEX] = QCwidth; @@ -6921,7 +6929,6 @@ init_xfaces (void) face_attr_sym[LFACE_DISTANT_FOREGROUND_INDEX] = QCdistant_foreground; face_attr_sym[LFACE_EXTEND_INDEX] = QCextend; } -#endif void syms_of_xfaces (void) |