From db3b3b350658e31c2668f2a14072d6ada9e2ae7c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 3 Mar 2019 19:02:34 +0200 Subject: [PATCH] Fix starting temacs interactively * src/dispnew.c (init_display_interactive): Don't call init_faces_initial if we aren't initialized, since tty-set-up-initial-frame-faces is not available then. This restores the ability to start "temacs -nw" and also avoids bad crashes in "emacs -nw" if the pdumper file is not found. (Bug#34707) --- src/dispnew.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dispnew.c b/src/dispnew.c index 9220213b907..7596528fed9 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -6186,7 +6186,7 @@ init_display_interactive (void) calculate_costs (XFRAME (selected_frame)); /* Set up faces of the initial terminal frame. */ - if (!noninteractive && NILP (Vinitial_window_system)) + if (initialized && !noninteractive && NILP (Vinitial_window_system)) init_faces_initial (); } -- 2.39.5