]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix starting temacs interactively
authorEli Zaretskii <eliz@gnu.org>
Sun, 3 Mar 2019 17:02:34 +0000 (19:02 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sun, 3 Mar 2019 17:02:34 +0000 (19:02 +0200)
* 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

index 9220213b907ffba772aabdc9e966257af4233e4f..7596528fed9020944f4e17047c57642118a8f009 100644 (file)
@@ -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 ();
 }