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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0bbb8ce85c4a1151ef469cf24ad15de32ad2db57..263ac12455349e7e6eb2c5f884a772f248621774 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-31  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       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  <dann@ics.uci.edu>
 
        * dispnew.c (add_window_display_history): Use const for the string

diff --git a/src/dispnew.c b/src/dispnew.c
index e98afbc9c3b6f9bcb626311df281a5e19f566464..501dc4ffd80425a5d3b14300977ac31da2cb66bf 100644 (file)
--- 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 74e222f85fce3e2c02b1b489e7d599d5227dcfab..6008ba9567af4603662db2cc339881d4bb8af1ac 100644 (file)
--- 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;
 }