[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master db3b3b3: Fix starting temacs interactively
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master db3b3b3: Fix starting temacs interactively |
Date: |
Sun, 3 Mar 2019 12:03:30 -0500 (EST) |
branch: master
commit db3b3b350658e31c2668f2a14072d6ada9e2ae7c
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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 9220213..7596528 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 ();
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master db3b3b3: Fix starting temacs interactively,
Eli Zaretskii <=