Merge from trunk.

5 files changed, 27 insertions, 13 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4a9e651e4d1..6d1b740de9c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -14,6 +14,29 @@
         (access_keymap): NATNUMP -> INTEGERP, since the integer must be
         nonnegative.
 
+2011-05-31  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/data.$(O), $(BLD)/editfns.$(O)):
+        Update dependencies.
+
+2011-05-31  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * data.c (init_data): Remove code for UTS, this system is not
+        supported anymore.
+
+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
+        pointer.  Remove declaration, not needed.
+
 2011-05-31  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use 'inline', not 'INLINE'.
diff --git a/src/data.c b/src/data.c
index 443d78376d9..78bd454056d 100644
--- a/src/data.c
+++ b/src/data.c
@@ -3220,8 +3220,4 @@ init_data (void)
     return;
 #endif /* CANNOT_DUMP */
   signal (SIGFPE, arith_error);
-
-#ifdef uts
-  signal (SIGEMT, arith_error);
-#endif /* uts */
 }
diff --git a/src/dispnew.c b/src/dispnew.c
index cd20bd6e9aa..501dc4ffd80 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -290,7 +290,6 @@ static int history_idx;
 static unsigned history_tick;
 
 static void add_frame_display_history (struct frame *, int);
-static void add_window_display_history (struct window *, char *, int);
 
 /* Add to the redisplay history how window W has been displayed.
    MSG is a trace containing the information how W's glyph matrix
@@ -298,7 +297,7 @@ static void add_window_display_history (struct window *, char *, int);
    has been interrupted for pending input.  */
 
 static void
-add_window_display_history (struct window *w, char *msg, int paused_p)
+add_window_display_history (struct window *w, const char *msg, int paused_p)
 {
   char *buf;
 
@@ -6234,11 +6233,7 @@ init_display (void)
         }
     }
 
-  if (!inhibit_window_system && display_arg
-#ifndef CANNOT_DUMP
-     && initialized
-#endif
-     )
+  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;
 }
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 060b565b308..8da589a7115 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -654,6 +654,7 @@ $(BLD)/data.$(O) : \
         $(SRC)/data.c \
         $(CONFIG_H) \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(EMACS_ROOT)/lib/intprops.h \
         $(LISP_H) \
         $(SRC)/buffer.h \
         $(SRC)/ccl.h \
@@ -753,6 +754,7 @@ $(BLD)/editfns.$(O) : \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(EMACS_ROOT)/lib/intprops.h \
         $(EMACS_ROOT)/lib/strftime.h \
+        $(EMACS_ROOT)/lib/verify.h \
         $(LISP_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \