From 4fcc2638bf7978aed4705df9b6902a7f7e3fd498 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Tue, 31 May 2011 07:52:10 -0700 Subject: [PATCH] Don't force ./temacs to start in terminal mode. * frame.c (make_initial_frame): Initialize faces in all cases, not only when CANNOT_DUMP is defined. * dispnew.c (init_display): Remove CANNOT_DUMP condition. --- src/ChangeLog | 8 ++++++++ src/dispnew.c | 3 +-- src/frame.c | 2 -- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0bbb8ce85c4..263ac124553 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2011-05-31 Dan Nicolaescu + + Don't force ./temacs to start in terminal mode. + + * frame.c (make_initial_frame): Initialize faces in all cases, not + only when CANNOT_DUMP is defined. + * dispnew.c (init_display): Remove CANNOT_DUMP condition. + 2011-05-31 Dan Nicolaescu * dispnew.c (add_window_display_history): Use const for the string diff --git a/src/dispnew.c b/src/dispnew.c index e98afbc9c3b..501dc4ffd80 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -6233,8 +6233,7 @@ init_display (void) } } - if (!inhibit_window_system && display_arg - ) + if (!inhibit_window_system && display_arg) { Vinitial_window_system = Qx; #ifdef HAVE_X11 diff --git a/src/frame.c b/src/frame.c index 74e222f85fc..6008ba9567a 100644 --- a/src/frame.c +++ b/src/frame.c @@ -544,10 +544,8 @@ make_initial_frame (void) /* The default value of menu-bar-mode is t. */ set_menu_bar_lines (f, make_number (1), Qnil); -#ifdef CANNOT_DUMP if (!noninteractive) init_frame_faces (f); -#endif return f; } -- 2.39.5