Commit bf4099b2 authored by Eli Zaretskii's avatar Eli Zaretskii

Fix face initializations in pdump'ed Emacs

* src/dispnew.c (init_display_interactive): Call init_faces_initial
in the daemon if dumped with pdumper. (Bug#34114)
parent ce085f1d
Pipeline #624 passed with stage
in 54 minutes and 47 seconds
......@@ -6035,10 +6035,21 @@ init_display_interactive (void)
/* If running as a daemon, no need to initialize any frames/terminal,
except on Windows, where we at least want to initialize it. */
#ifndef WINDOWSNT
if (IS_DAEMON)
{
/* Pdump'ed Emacs doesn't record the initial frame from temacs,
so the non-basic faces realized for that frame in temacs
aren't in emacs. This causes errors when users try to
customize those faces in their init file. The call to
init_faces_initial will realize these faces now. (Non-daemon
Emacs does this either near the end of this function or when
the GUI frame is created.) */
if (dumped_with_pdumper_p ())
init_faces_initial ();
#ifndef WINDOWSNT
return;
#endif
}
/* If the user wants to use a window system, we shouldn't bother
initializing the terminal. This is especially important when the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment