diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-03-03 19:02:34 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-03-03 19:02:34 +0200 |
| commit | db3b3b350658e31c2668f2a14072d6ada9e2ae7c (patch) | |
| tree | 6fb8c23e1a1a0f6f5d27b7d03b4cc9c82d195a59 /src/dispnew.c | |
| parent | 8a64107f7de6db557a2c43147369c6a93adf6668 (diff) | |
| download | emacs-db3b3b350658e31c2668f2a14072d6ada9e2ae7c.tar.gz emacs-db3b3b350658e31c2668f2a14072d6ada9e2ae7c.tar.bz2 emacs-db3b3b350658e31c2668f2a14072d6ada9e2ae7c.zip | |
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)
Diffstat (limited to 'src/dispnew.c')
| -rw-r--r-- | src/dispnew.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 (); } |