mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 19:31:02 -08:00
Code Issues Projects Releases Wiki Activity

Fix merging of anonymous faces with an `:extend' property on unexec

Browse source 
* 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.
This commit is contained in:
Po Lu 2022-05-12 14:55:41 +08:00
parent 5743b74d4b
commit a4a229dfff
3 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lisp.h
View file

@ -5093,9 +5093,7 @@ extern void syms_of_w32cygwinx (void);
extern Lisp_Object Vface_alternative_font_family_alist;
extern Lisp_Object Vface_alternative_font_registry_alist;
extern void syms_of_xfaces (void);
#ifdef HAVE_PDUMPER
extern void init_xfaces (void);
#endif
#ifdef HAVE_X_WINDOWS
/* Defined in xfns.c. */