Merge from mainline.

20 files changed, 231 insertions, 204 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2eaefe41fac..7aae2a3754f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,90 @@
+2010-03-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * process.c (Fmake_network_process): Don't apply Bug#5173 fix for
+        Windows.
+
+2010-03-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * process.c (Fmake_network_process): Don't call turn_on_atimers around
+        `connect' (Bug#5723).
+
+2010-03-25  Helmut Eller  <eller.helmut@gmail.com>
+
+        * process.c (Fmake_network_process): Call `select' for interrupted
+        `connect' rather than creating new socket (Bug#5173).
+
+2010-03-24  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * frame.c (x_get_arg): Handle RES_TYPE_BOOLEAN_NUMBER (bug #5736).
+
+        * xfns.c (Fx_create_frame): Make menuBar a RES_TYPE_BOOLEAN_NUMBER.
+
+        * dispextern.h (resource_types): RES_TYPE_BOOLEAN_NUMBER is new.
+
+2010-03-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around
+        XLoadQueryFont.
+
+2010-03-24  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (decode_coding_ccl): Fix previous change for the
+        multibyte case.
+        (encode_coding_ccl): Don't setup ccl program here.  Fix for the
+        case that the output buffer is fullfilled.
+        (encode_coding): Setup ccl program here.
+
+2010-03-24  Andreas Politz  <politza@fh-trier.de>  (tiny change)
+
+        * editfns.c (Fformat): Account for string precision when computing
+        field width (Bug#5710).
+
+2010-03-23  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * s/gnu-linux.h (LIBS_SYSTEM): Remove, same as default.
+
+        Simplify LIBS_MACHINE definitions.
+        * m/hp800.h (LIBS_MACHINE): Remove, same as default.
+        * m/iris4d.h (LIBS_MACHINE): Likewise.
+        * m/ibmrs6000.h (LIBS_MACHINE): Rename to LIBS_SYSTEM and move ...
+        * s/aix4-2.h (LIBS_SYSTEM): ... here.
+        * s/netbsd.h: Remove commented out code.
+
+2010-03-22  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Remove dead code dealing with POSIX_SIGNALS.
+        * atimer.c (set_alarm): Remove dead code, all USG systems define
+        POSIX_SIGNALS.
+        * data.c (arith_error): Likewise.
+        * keyboard.c (input_available_signal, handle_user_signal)
+        (interrupt_signal): Likewise.
+        * process.c (sigchld_handler): Likewise.
+        (create_process): Remove if 0 code.  Remove HPUX conditional when
+        !defined (POSIX_SIGNALS), it cannot be true.
+        * syssignal.h: Remove USG5_4 and USG conditionals when
+        !POSIX_SIGNALS, they cannot be true.
+
+        * keyboard.c (Fset_input_interrupt_mode): Remove code depending on
+        NO_SOCK_SIGIO, not used anymore.
+
+2010-03-21  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * m/vax.h (BSD_SYSTEM, BSD4_2): Remove conditionals, we only
+        support vax on BSDs.
+
+        * m/ibmrs6000.h (ORDINARY_LINK): Move definition ...
+        * s/aix4-2.h (ORDINARY_LINK): ... here.
+
+2010-03-21  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * Makefile.in (abs_builddir): Define.
+        (bootstrap_exe): Use it.
+        (VPATH): Use $(srcdir) instead of @srcdir@.
+
+2010-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * Makefile.in (bootstrap_exe): Use an absolute name.
+
 2010-03-20  Dan Nicolaescu  <dann@ics.uci.edu>
 
         Remove support for old GNU/Linux using libc version 5.
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 30ac527215f..6cc3d0f9e3e 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -7154,9 +7154,9 @@
         (ENCODE_ISO_CHARACTER): Bug of handling return value of unify_char
         fixed.
         (DECODE_SJIS_BIG5_CHARACTER): New macro.
-        (decode_coding_sjis_big5): Handle character unificatoin table.
+        (decode_coding_sjis_big5): Handle character unification table.
         Use macro DECODE_SJIS_BIG5_CHARACTER.
-        (encode_coding_sjis_big5): Handle character unificatoin table.
+        (encode_coding_sjis_big5): Handle character unification table.
         Use macro ENCODE_SJIS_BIG5_CHARACTER.
         (setup_coding_system): Handle members
         character_unification_table_for_decode and
diff --git a/src/Makefile.in b/src/Makefile.in
index 51c06835396..18d7693da2e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -33,16 +33,17 @@
 
 # Here are the things that we expect ../configure to edit.
 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
-srcdir=@srcdir@
-VPATH=@srcdir@
-CC=@CC@
-CPP=@CPP@
-CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
-LDFLAGS=@LDFLAGS@
-LN_S=@LN_S@
-EXEEXT=@EXEEXT@
-version=@version@
+srcdir = @srcdir@
+abs_builddir = @abs_builddir@
+VPATH = $(srcdir)
+CC = @CC@
+CPP = @CPP@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LN_S = @LN_S@
+EXEEXT = @EXEEXT@
+version = @version@
 # Substitute an assignment for the MAKE variable, because
 # BSD doesn't have it as a default.
 @SET_MAKE@
@@ -63,7 +64,7 @@ M_FILE = ${srcdir}/@machfile@
 S_FILE = ${srcdir}/@opsysfile@
 config_h = config.h $(M_FILE) $(S_FILE)
 
-bootstrap_exe = ../src/bootstrap-emacs${EXEEXT}
+bootstrap_exe = ${abs_builddir}/bootstrap-emacs${EXEEXT}
 
 OTHER_FILES = @OTHER_FILES@
 
diff --git a/src/atimer.c b/src/atimer.c
index 432e2590dad..556272d7918 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -296,12 +296,6 @@ unwind_stop_other_atimers (dummy)
 static void
 set_alarm ()
 {
-#if defined (USG) && !defined (POSIX_SIGNALS)
-  /* USG systems forget handlers when they are used;
-     must reestablish each time.  */
-  signal (SIGALRM, alarm_signal_handler);
-#endif /* USG */
-
   if (atimers)
     {
       EMACS_TIME now, time;
diff --git a/src/coding.c b/src/coding.c
index df81eaba16e..bdc37cb7c53 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -5245,7 +5245,7 @@ decode_coding_ccl (coding)
   int multibytep = coding->src_multibyte;
   struct ccl_program *ccl = &coding->spec.ccl->ccl;
   int source_charbuf[1024];
-  int source_byteidx[1024];
+  int source_byteidx[1025];
   Lisp_Object attrs, charset_list;
 
   CODING_GET_INFO (coding, attrs, charset_list);
@@ -5256,11 +5256,14 @@ decode_coding_ccl (coding)
       int i = 0;
 
       if (multibytep)
-        while (i < 1024 && p < src_end)
-          {
-            source_byteidx[i] = p - src;
-            source_charbuf[i++] = STRING_CHAR_ADVANCE (p);
-          }
+        {
+          while (i < 1024 && p < src_end)
+            {
+              source_byteidx[i] = p - src;
+              source_charbuf[i++] = STRING_CHAR_ADVANCE (p);
+            }
+          source_byteidx[i] = p - src;
+        }
       else
         while (i < 1024 && p < src_end)
           source_charbuf[i++] = *p++;
@@ -5270,7 +5273,7 @@ decode_coding_ccl (coding)
       ccl_driver (ccl, source_charbuf, charbuf, i, charbuf_end - charbuf,
                   charset_list);
       charbuf += ccl->produced;
-      if (multibytep && ccl->consumed < i)
+      if (multibytep)
         src += source_byteidx[ccl->consumed];
       else
         src += ccl->consumed;
@@ -5304,7 +5307,7 @@ static int
 encode_coding_ccl (coding)
      struct coding_system *coding;
 {
-  struct ccl_program ccl;
+  struct ccl_program *ccl = &coding->spec.ccl->ccl;
   int multibytep = coding->dst_multibyte;
   int *charbuf = coding->charbuf;
   int *charbuf_end = charbuf + coding->charbuf_used;
@@ -5315,35 +5318,34 @@ encode_coding_ccl (coding)
   Lisp_Object attrs, charset_list;
 
   CODING_GET_INFO (coding, attrs, charset_list);
-  setup_ccl_program (&ccl, CODING_CCL_ENCODER (coding));
-
-  ccl.last_block = coding->mode & CODING_MODE_LAST_BLOCK;
-  ccl.dst_multibyte = coding->dst_multibyte;
+  if (coding->consumed_char == coding->src_chars
+      && coding->mode & CODING_MODE_LAST_BLOCK)
+    ccl->last_block = 1;
 
   while (charbuf < charbuf_end)
     {
-      ccl_driver (&ccl, charbuf, destination_charbuf,
+      ccl_driver (ccl, charbuf, destination_charbuf,
                   charbuf_end - charbuf, 1024, charset_list);
       if (multibytep)
         {
-          ASSURE_DESTINATION (ccl.produced * 2);
-          for (i = 0; i < ccl.produced; i++)
+          ASSURE_DESTINATION (ccl->produced * 2);
+          for (i = 0; i < ccl->produced; i++)
             EMIT_ONE_BYTE (destination_charbuf[i] & 0xFF);
         }
       else
         {
-          ASSURE_DESTINATION (ccl.produced);
-          for (i = 0; i < ccl.produced; i++)
+          ASSURE_DESTINATION (ccl->produced);
+          for (i = 0; i < ccl->produced; i++)
             *dst++ = destination_charbuf[i] & 0xFF;
-          produced_chars += ccl.produced;
+          produced_chars += ccl->produced;
         }
-      charbuf += ccl.consumed;
-      if (ccl.status == CCL_STAT_QUIT
-          || ccl.status == CCL_STAT_INVALID_CMD)
+      charbuf += ccl->consumed;
+      if (ccl->status == CCL_STAT_QUIT
+          || ccl->status == CCL_STAT_INVALID_CMD)
         break;
     }
 
-  switch (ccl.status)
+  switch (ccl->status)
     {
     case CCL_STAT_SUSPEND_BY_SRC:
       record_conversion_result (coding, CODING_RESULT_INSUFFICIENT_SRC);
@@ -7534,6 +7536,7 @@ encode_coding (coding)
   Lisp_Object attrs;
   Lisp_Object translation_table;
   int max_lookup;
+  struct ccl_spec cclspec;
 
   attrs = CODING_ID_ATTRS (coding->id);
   if (coding->encoder == encode_coding_raw_text)
@@ -7555,6 +7558,11 @@ encode_coding (coding)
 
   ALLOC_CONVERSION_WORK_AREA (coding);
 
+  if (coding->encoder == encode_coding_ccl)
+    {
+      coding->spec.ccl = &cclspec;
+      setup_ccl_program (&cclspec.ccl, CODING_CCL_ENCODER (coding));
+    }
   do {
     coding_set_source (coding);
     consume_chars (coding, translation_table, max_lookup);
diff --git a/src/config.in b/src/config.in
index ef2c25c85d0..e1837e74560 100644
--- a/src/config.in
+++ b/src/config.in
@@ -318,10 +318,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the <kerberos/krb.h> header file. */
 #undef HAVE_KERBEROS_KRB_H
 
-/* Define to 1 if `e_text' is member of `krb5_error'. */
+/* Define to 1 if `e_text' is a member of `krb5_error'. */
 #undef HAVE_KRB5_ERROR_E_TEXT
 
-/* Define to 1 if `text' is member of `krb5_error'. */
+/* Define to 1 if `text' is a member of `krb5_error'. */
 #undef HAVE_KRB5_ERROR_TEXT
 
 /* Define to 1 if you have the <krb5.h> header file. */
@@ -615,25 +615,25 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `strsignal' function. */
 #undef HAVE_STRSIGNAL
 
-/* Define to 1 if `ifr_addr' is member of `struct ifreq'. */
+/* Define to 1 if `ifr_addr' is a member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_ADDR
 
-/* Define to 1 if `ifr_broadaddr' is member of `struct ifreq'. */
+/* Define to 1 if `ifr_broadaddr' is a member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_BROADADDR
 
-/* Define to 1 if `ifr_flags' is member of `struct ifreq'. */
+/* Define to 1 if `ifr_flags' is a member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_FLAGS
 
-/* Define to 1 if `ifr_hwaddr' is member of `struct ifreq'. */
+/* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_HWADDR
 
-/* Define to 1 if `ifr_netmask' is member of `struct ifreq'. */
+/* Define to 1 if `ifr_netmask' is a member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_NETMASK
 
-/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */
+/* Define to 1 if `n_un.n_name' is a member of `struct nlist'. */
 #undef HAVE_STRUCT_NLIST_N_UN_N_NAME
 
-/* Define to 1 if `tm_zone' is member of `struct tm'. */
+/* Define to 1 if `tm_zone' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
 /* Define to 1 if `struct utimbuf' is declared by <utime.h>. */
@@ -860,6 +860,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -919,6 +922,28 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if using the Motif X toolkit. */
 #undef USE_MOTIF
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to 1 if we should use toolkit scroll bars. */
 #undef USE_TOOLKIT_SCROLL_BARS
 
@@ -954,28 +979,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* Define to rpl_ if the getopt replacement functions and variables should be
    used. */
 #undef __GETOPT_PREFIX
diff --git a/src/data.c b/src/data.c
index e405ca6af9e..bdba3a9bb36 100644
--- a/src/data.c
+++ b/src/data.c
@@ -3291,11 +3291,6 @@ SIGTYPE
 arith_error (signo)
      int signo;
 {
-#if defined(USG) && !defined(POSIX_SIGNALS)
-  /* USG systems forget handlers when they are used;
-     must reestablish each time */
-  signal (signo, arith_error);
-#endif /* USG */
   sigsetmask (SIGEMPTYMASK);
 
   SIGNAL_THREAD_CHECK (signo);
diff --git a/src/dispextern.h b/src/dispextern.h
index 3202385e541..03b35df397c 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3266,7 +3266,8 @@ enum resource_types
   RES_TYPE_FLOAT,
   RES_TYPE_BOOLEAN,
   RES_TYPE_STRING,
-  RES_TYPE_SYMBOL
+  RES_TYPE_SYMBOL,
+  RES_TYPE_BOOLEAN_NUMBER
 };
 
 extern Lisp_Object x_get_arg P_ ((Display_Info *, Lisp_Object,
diff --git a/src/frame.c b/src/frame.c
index 40930af594c..757ed8f01a3 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4005,6 +4005,13 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type)
             case RES_TYPE_NUMBER:
               return make_number (atoi (SDATA (tem)));
 
+            case RES_TYPE_BOOLEAN_NUMBER:
+              if (!strcmp (SDATA (tem), "on")
+                  || !strcmp (SDATA (tem), "true"))
+                return make_number (1);
+              return make_number (atoi (SDATA (tem)));
+              break;
+
             case RES_TYPE_FLOAT:
               return make_float (atof (SDATA (tem)));
 
diff --git a/src/keyboard.c b/src/keyboard.c
index 48d39235e3f..f6d6704b373 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7507,12 +7507,6 @@ input_available_signal (signo)
 {
   /* Must preserve main program's value of errno.  */
   int old_errno = errno;
-#if defined (USG) && !defined (POSIX_SIGNALS)
-  /* USG systems forget handlers when they are used;
-     must reestablish each time */
-  signal (signo, input_available_signal);
-#endif /* USG */
-
   SIGNAL_THREAD_CHECK (signo);
 
 #ifdef SYNC_INPUT
@@ -7595,12 +7589,6 @@ handle_user_signal (sig)
   int old_errno = errno;
   struct user_signal_info *p;
 
-#if defined (USG) && !defined (POSIX_SIGNALS)
-  /* USG systems forget handlers when they are used;
-     must reestablish each time */
-  signal (sig, handle_user_signal);
-#endif
-
   SIGNAL_THREAD_CHECK (sig);
 
   for (p = user_signals; p; p = p->next)
@@ -11089,13 +11077,6 @@ interrupt_signal (signalnum)	/* If we don't have an argument, */
   int old_errno = errno;
   struct terminal *terminal;
 
-#if defined (USG) && !defined (POSIX_SIGNALS)
-  /* USG systems forget handlers when they are used;
-     must reestablish each time */
-  signal (SIGINT, interrupt_signal);
-  signal (SIGQUIT, interrupt_signal);
-#endif /* USG */
-
   SIGNAL_THREAD_CHECK (signalnum);
 
   /* See if we have an active terminal on our controlling tty. */
@@ -11304,11 +11285,7 @@ See also `current-input-mode'.  */)
     {
       /* When using X, don't give the user a real choice,
          because we haven't implemented the mechanisms to support it.  */
-#ifdef NO_SOCK_SIGIO
-      new_interrupt_input = 0;
-#else /* not NO_SOCK_SIGIO */
       new_interrupt_input = 1;
-#endif /* NO_SOCK_SIGIO */
     }
   else
 #endif /* HAVE_X_WINDOWS */
diff --git a/src/m/hp800.h b/src/m/hp800.h
index 5614141fe63..8acec110272 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -93,7 +93,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define UNEXEC unexhp9k800.o
 
-#define LIBS_MACHINE
 #define LIBS_DEBUG
 
 /* Include the file bsdtty.h, since this machine has job control.  */
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 4304ea90cd0..a7d35cc8ab7 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -57,15 +57,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define NLIST_STRUCT
 #endif
 
-/* -lpthreads seems to be necessary for Xlib in X11R6, and should be harmless
-   on older versions of X where it happens to exist.  */
-#ifdef HAVE_LIBPTHREADS
-#define LIBS_MACHINE -lrts -lIM -liconv -lpthreads
-#else
-/* IBM's X11R5 use -lIM and -liconv in AIX 3.2.2.  */
-#define LIBS_MACHINE -lrts -lIM -liconv
-#endif
-
 #undef ADDR_CORRECT
 #define ADDR_CORRECT(x) ((int)(x))
 
@@ -81,7 +72,5 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define BROKEN_SIGPTY
 #define BROKEN_SIGPOLL
 
-#define ORDINARY_LINK
-
 /* arch-tag: 028318ee-a7ae-4a08-804d-cc1e6588d003
    (do not change this comment) */
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 7c0ff78a069..06bffceb64c 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -53,8 +53,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define DATA_START 0x10000000
 #define DATA_SEG_BITS   0x10000000
 
-#undef LIBS_MACHINE
-#define LIBS_MACHINE
 #define LIBS_DEBUG
 
 /* Use terminfo instead of termcap.  */
diff --git a/src/m/vax.h b/src/m/vax.h
index fa6cc1b5977..62c78e68ab0 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -38,7 +38,6 @@ NOTE-END  */
 
 #define CRT0_DUMMIES
 
-#ifdef BSD_SYSTEM
 /* USG systems I know of running on Vaxes do not actually
    support the load average, so disable it for them.  */
 
@@ -50,11 +49,7 @@ NOTE-END  */
 
 #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
 
-#endif /* BSD_SYSTEM */
-
-#ifdef BSD4_2
 #define HAVE_FTIME
-#endif
 
 /* arch-tag: 508bdf7a-01a0-4ce0-8eba-0704d0df55a0
    (do not change this comment) */
diff --git a/src/process.c b/src/process.c
index 53cc42f223e..4f103752296 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1878,13 +1878,7 @@ create_process (process, new_argv, current_dir)
 #ifdef AIX
   struct sigaction sighup_action;
 #endif
-#else /* !POSIX_SIGNALS */
-#if 0
-#ifdef SIGCHLD
-  SIGTYPE (*sigchld)();
-#endif
-#endif /* 0 */
-#endif /* !POSIX_SIGNALS */
+#endif /* POSIX_SIGNALS */
   /* Use volatile to protect variables from being clobbered by longjmp.  */
   volatile int forkin, forkout;
   volatile int pty_flag = 0;
@@ -2008,14 +2002,9 @@ create_process (process, new_argv, current_dir)
   sigprocmask (SIG_BLOCK, &blocked, &procmask);
 #else /* !POSIX_SIGNALS */
 #ifdef SIGCHLD
-#if defined (BSD_SYSTEM) || defined (HPUX)
+#if defined (BSD_SYSTEM)
   sigsetmask (sigmask (SIGCHLD));
-#else /* ordinary USG */
-#if 0
-  sigchld_deferred = 0;
-  sigchld = signal (SIGCHLD, create_process_sigchld);
-#endif
-#endif /* ordinary USG */
+#endif /* BSD_SYSTEM */
 #endif /* SIGCHLD */
 #endif /* !POSIX_SIGNALS */
 
@@ -2172,13 +2161,9 @@ create_process (process, new_argv, current_dir)
         sigprocmask (SIG_SETMASK, &procmask, 0);
 #else /* !POSIX_SIGNALS */
 #ifdef SIGCHLD
-#if defined (BSD_SYSTEM) || defined (HPUX)
+#if defined (BSD_SYSTEM)
         sigsetmask (SIGEMPTYMASK);
-#else /* ordinary USG */
-#if 0
-        signal (SIGCHLD, sigchld);
-#endif
-#endif /* ordinary USG */
+#endif /* BSD_SYSTEM */
 #endif /* SIGCHLD */
 #endif /* !POSIX_SIGNALS */
 
@@ -2275,17 +2260,9 @@ create_process (process, new_argv, current_dir)
   sigprocmask (SIG_SETMASK, &procmask, 0);
 #else /* !POSIX_SIGNALS */
 #ifdef SIGCHLD
-#if defined (BSD_SYSTEM) || defined (HPUX)
+#if defined (BSD_SYSTEM)
   sigsetmask (SIGEMPTYMASK);
-#else /* ordinary USG */
-#if 0
-  signal (SIGCHLD, sigchld);
-  /* Now really handle any of these signals
-     that came in during this function.  */
-  if (sigchld_deferred)
-    kill (getpid (), SIGCHLD);
-#endif
-#endif /* ordinary USG */
+#endif /* BSD_SYSTEM */
 #endif /* SIGCHLD */
 #endif /* !POSIX_SIGNALS */
 
@@ -3640,23 +3617,9 @@ usage: (make-network-process &rest ARGS)  */)
       immediate_quit = 1;
       QUIT;
 
-      /* This turns off all alarm-based interrupts; the
-         bind_polling_period call above doesn't always turn all the
-         short-interval ones off, especially if interrupt_input is
-         set.
-
-         It'd be nice to be able to control the connect timeout
-         though.  Would non-blocking connect calls be portable?
-
-         This used to be conditioned by HAVE_GETADDRINFO.  Why?  */
-
-      turn_on_atimers (0);
-
       ret = connect (s, lres->ai_addr, lres->ai_addrlen);
       xerrno = errno;
 
-      turn_on_atimers (1);
-
       if (ret == 0 || xerrno == EISCONN)
         {
           /* The unwind-protect will be discarded afterwards.
@@ -3676,6 +3639,40 @@ usage: (make-network-process &rest ARGS)  */)
 #endif
 #endif
 
+#ifndef WINDOWSNT
+      if (xerrno == EINTR)
+        {
+          /* Unlike most other syscalls connect() cannot be called
+             again.  (That would return EALREADY.)  The proper way to
+             wait for completion is select(). */
+          int sc, len;
+          SELECT_TYPE fdset;
+        retry_select:
+          FD_ZERO (&fdset);
+          FD_SET (s, &fdset);
+          QUIT;
+          sc = select (s + 1, (SELECT_TYPE *)0, &fdset, (SELECT_TYPE *)0,
+                       (EMACS_TIME *)0);
+          if (sc == -1)
+            {
+              if (errno == EINTR)
+                goto retry_select;
+              else
+                report_file_error ("select failed", Qnil);
+            }
+          eassert (sc > 0);
+
+          len = sizeof xerrno;
+          eassert (FD_ISSET (s, &fdset));
+          if (getsockopt (s, SOL_SOCKET, SO_ERROR, &xerrno, &len) == -1)
+            report_file_error ("getsockopt failed", Qnil);
+          if (xerrno)
+            errno = xerrno, report_file_error ("error during connect", Qnil);
+          else
+            break;
+        }
+#endif /* !WINDOWSNT */
+
       immediate_quit = 0;
 
       /* Discard the unwind protect closing S.  */
@@ -3683,8 +3680,10 @@ usage: (make-network-process &rest ARGS)  */)
       emacs_close (s);
       s = -1;
 
+#ifdef WINDOWSNT
       if (xerrno == EINTR)
         goto retry_connect;
+#endif
     }
 
   if (s >= 0)
@@ -6704,11 +6703,6 @@ sigchld_handler (signo)
           /* PID == 0 means no processes found, PID == -1 means a real
              failure.  We have done all our job, so return.  */
 
-          /* USG systems forget handlers when they are used;
-             must reestablish each time */
-#if defined (USG) && !defined (POSIX_SIGNALS)
-          signal (signo, sigchld_handler);   /* WARNING - must come after wait3() */
-#endif
           errno = old_errno;
           return;
         }
@@ -6809,9 +6803,6 @@ sigchld_handler (signo)
 #if (defined WINDOWSNT \
      || (defined USG && !defined GNU_LINUX \
          && !(defined HPUX && defined WNOHANG)))
-#if defined (USG) && ! defined (POSIX_SIGNALS)
-      signal (signo, sigchld_handler);
-#endif
       errno = old_errno;
       return;
 #endif /* USG, but not HPUX with WNOHANG */
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index a1abf13466d..93869db6bca 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -95,6 +95,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define LIB_STANDARD
 
+/* -lpthreads seems to be necessary for Xlib in X11R6, and should be harmless
+   on older versions of X where it happens to exist.  */
+#ifdef HAVE_LIBPTHREADS
+#define LIBS_SYSTEM -lrts -lIM -liconv -lpthreads
+#else
+/* IBM's X11R5 use -lIM and -liconv in AIX 3.2.2.  */
+#define LIBS_SYSTEM -lrts -lIM -liconv
+#endif
+
 /* Use terminfo instead of termcap.  */
 
 #define TERMINFO
@@ -170,5 +179,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define UNEXEC unexaix.o
 
+#define ORDINARY_LINK
+
 /* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562
    (do not change this comment) */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index ae2eaa43c06..0c198de26d8 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -207,9 +207,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define C_DEBUG_SWITCH
 #endif
 
-/* alane@wozzle.linet.org says that -lipc is not a separate library,
-   since libc-4.4.1.  So -lipc was deleted.  */
-#define LIBS_SYSTEM
 /* _BSD_SOURCE is redundant, at least in glibc2, since we define
    _GNU_SOURCE.  Left in in case it's relevant to libc5 systems and
    anyone's still using Emacs on those.  --fx 2002-12-14  */
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 1af4c94d105..5552aece50a 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -26,8 +26,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 
-/* -lutil is not needed for NetBSD >0.9.  */
-/* #define LIBS_SYSTEM -lutil */
 #define LIBS_TERMCAP -ltermcap
 
 #define NEED_ERRNO
diff --git a/src/syssignal.h b/src/syssignal.h
index 64dacc671ce..f435d338594 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -88,38 +88,12 @@ sigset_t sys_sigsetmask P_ ((sigset_t new_mask));
 #define sys_sigdel(MASK,SIG) sigdelset (&MASK,SIG)
 
 #else /* ! defined (POSIX_SIGNALS) */
-#ifdef USG5_4
-
-extern SIGMASKTYPE sigprocmask_set;
-
-#ifndef sigblock
-#define sigblock(sig)                                   \
-     (sigprocmask_set = SIGEMPTYMASK | (sig),           \
-      sigprocmask (SIG_BLOCK, &sigprocmask_set, NULL))
-#endif
-
-#ifndef sigunblock
-#define sigunblock(sig)                                         \
-     (sigprocmask_set = SIGFULLMASK & ~(sig),                   \
-      sigprocmask (SIG_SETMASK, &sigprocmask_set, NULL))
-#endif
-
-#else
-#ifdef USG
-
-#ifndef sigunblock
-#define sigunblock(sig)
-#endif
-
-#else
 
 #ifndef sigunblock
 #define sigunblock(SIG) \
 { SIGMASKTYPE omask = sigblock (SIGEMPTYMASK); sigsetmask (omask & ~SIG); }
 #endif
 
-#endif /* ! defined (USG) */
-#endif /* ! defined (USG5_4) */
 #endif /* ! defined (POSIX_SIGNALS) */
 
 #ifndef SIGMASKTYPE
diff --git a/src/xfns.c b/src/xfns.c
index 45bea1e4ec2..ae5858ccfb5 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3347,7 +3347,9 @@ This function is an internal primitive--use `make-frame' instead.  */)
 #ifdef USE_LUCID
   /* Prevent lwlib/xlwmenu.c from crashing because of a bug
      whereby it fails to get any font.  */
+  BLOCK_INPUT;
   xlwmenu_default_font = XLoadQueryFont (FRAME_X_DISPLAY (f), "fixed");
+  UNBLOCK_INPUT;
 #endif
 
   /* Frame contents get displaced if an embedded X window has a border.  */
@@ -3421,7 +3423,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
   init_frame_faces (f);
 
   x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
-                       "menuBar", "MenuBar", RES_TYPE_NUMBER);
+                       "menuBar", "MenuBar", RES_TYPE_BOOLEAN_NUMBER);
   x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
                        "toolBar", "ToolBar", RES_TYPE_NUMBER);
   x_default_parameter (f, parms, Qbuffer_predicate, Qnil,