*** empty log message ***

3 files changed, 13 insertions, 8 deletions

diff --git a/src/data.c b/src/data.c
index 9eb06132e4f..dba7d254aeb 100644
--- a/src/data.c
+++ b/src/data.c
@@ -28,6 +28,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "buffer.h"
 #endif
 
+#include "emacssignal.h"
+
 #ifdef LISP_FLOAT_TYPE
 #include <math.h>
 #endif /* LISP_FLOAT_TYPE */
@@ -1946,7 +1948,7 @@ arith_error (signo)
 #ifdef BSD4_1
   sigrelse (SIGFPE);
 #else /* not BSD4_1 */
-  sigsetmask (0);
+  sigsetmask (SIGEMPTYMASK);
 #endif /* not BSD4_1 */
 
   Fsignal (Qarith_error, Qnil);
diff --git a/src/emacs.c b/src/emacs.c
index 0d6aa206590..3757d5ae6b2 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -211,7 +211,10 @@ main (argc, argv, envp)
 #endif
 
 #ifdef HAVE_X_WINDOWS
-  /* Stupid kludge to catch command-line display spec.  ask jla */
+  /* Stupid kludge to catch command-line display spec.  We can't
+     handle this argument entirely in window system dependent code
+     because we don't even know which window system dependent code
+     to run until we've recognized this argument.  */
   {
     int i;
 
@@ -334,6 +337,10 @@ main (argc, argv, envp)
       noninteractive = 1;
     }
 
+#ifdef POSIX_SIGNALS
+  init_signals ();
+#endif
+
   if (
 #ifndef CANNOT_DUMP
       ! noninteractive || initialized
@@ -406,7 +413,7 @@ main (argc, argv, envp)
 #endif
   init_eval ();
   init_data ();
-  init_read ();
+  init_lread ();
 
   init_cmdargs (argc, argv, skip_args); /* Create list Vcommand_line_args */
   init_buffer ();       /* Init default directory of main buffer */
@@ -448,7 +455,7 @@ main (argc, argv, envp)
 #ifdef MAINTAIN_ENVIRONMENT
       syms_of_environ ();
 #endif /* MAINTAIN_ENVIRONMENT */
-      syms_of_read ();
+      syms_of_lread ();
       syms_of_print ();
       syms_of_eval ();
       syms_of_fns ();
diff --git a/src/xterm.h b/src/xterm.h
index dd367cfe7dd..58d3dd878e0 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -148,10 +148,6 @@ extern int x_input_blocked;
    during the current critical section.  */
 extern int x_pending_input;
 
-#ifndef sigmask
-#define sigmask(no) (1L << ((no) - 1))
-#endif
-
 /* Begin critical section. */
 #define BLOCK_INPUT (x_input_blocked++)