aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/dispnew.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/dispnew.c b/src/dispnew.c
index 88783cd5da7..300f1c2d70a 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6035,10 +6035,21 @@ init_display_interactive (void)
6035 6035
6036 /* If running as a daemon, no need to initialize any frames/terminal, 6036 /* If running as a daemon, no need to initialize any frames/terminal,
6037 except on Windows, where we at least want to initialize it. */ 6037 except on Windows, where we at least want to initialize it. */
6038#ifndef WINDOWSNT
6039 if (IS_DAEMON) 6038 if (IS_DAEMON)
6039 {
6040 /* Pdump'ed Emacs doesn't record the initial frame from temacs,
6041 so the non-basic faces realized for that frame in temacs
6042 aren't in emacs. This causes errors when users try to
6043 customize those faces in their init file. The call to
6044 init_faces_initial will realize these faces now. (Non-daemon
6045 Emacs does this either near the end of this function or when
6046 the GUI frame is created.) */
6047 if (dumped_with_pdumper_p ())
6048 init_faces_initial ();
6049#ifndef WINDOWSNT
6040 return; 6050 return;
6041#endif 6051#endif
6052 }
6042 6053
6043 /* If the user wants to use a window system, we shouldn't bother 6054 /* If the user wants to use a window system, we shouldn't bother
6044 initializing the terminal. This is especially important when the 6055 initializing the terminal. This is especially important when the