[Emacs-diffs] /srv/bzr/emacs/trunk r104450: Don't force ./temacs to start in terminal mode.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 104450
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-31 07:52:10 -0700
message:
  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.
modified:
  src/ChangeLog
  src/dispnew.c
  src/frame.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-31 14:44:16 +0000
+++ b/src/ChangeLog     2011-05-31 14:52:10 +0000
@@ -1,5 +1,13 @@
 2011-05-31  Dan Nicolaescu  <address@hidden>
 
+       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  <address@hidden>
+
        * dispnew.c (add_window_display_history): Use const for the string
        pointer.  Remove declaration, not needed.
 

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2011-05-31 14:44:16 +0000
+++ b/src/dispnew.c     2011-05-31 14:52:10 +0000
@@ -6233,8 +6233,7 @@
        }
     }
 
-  if (!inhibit_window_system && display_arg
-     )
+  if (!inhibit_window_system && display_arg)
     {
       Vinitial_window_system = Qx;
 #ifdef HAVE_X11

=== modified file 'src/frame.c'
--- a/src/frame.c       2011-05-29 00:45:00 +0000
+++ b/src/frame.c       2011-05-31 14:52:10 +0000
@@ -544,10 +544,8 @@
   /* 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;
 }