merge from trunk

diff --cc configure.ac
index 4c1c5a8e738fa4d998f18f7f5cd725faa9189dc7,aed625e44a9675debce5145e7b5d1c53bc170a53..1caf1edc2148595c37ac717aee28c4c345e5cb5e
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1292,8 -1199,8 +1199,8 @@@ dnl checks for header file
  AC_CHECK_HEADERS_ONCE(
    linux/version.h sys/systeminfo.h
    coff.h pty.h
-   sys/vlimit.h sys/resource.h
+   sys/resource.h
 -  sys/utsname.h pwd.h utmp.h util.h)
 +  sys/utsname.h pwd.h utmp.h util.h sys/prctl.h)
  
  AC_MSG_CHECKING(if personality LINUX32 can be set)
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/personality.h>]], [[personality (PER_LINUX32)]])],

diff --cc doc/lispref/elisp.texi
Simple merge

diff --cc doc/lispref/objects.texi
Simple merge

diff --cc doc/lispref/processes.texi
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/buffer.h
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/process.c
index d56819da67a5c0f54ef769545e97655f1031e03f,bafdca9bd63778aa97f4b8178ecc726500c82101..044e0c5477292c042c16bdba9881565c2b7ed648
--- 1/src/process.c
--- 2/src/process.c
+++ b/src/process.c
@@@ -4376,13 -4211,9 +4374,13 @@@ wait_reading_process_output (intmax_t t
    Lisp_Object proc;
    EMACS_TIME timeout, end_time;
    int wait_channel = -1;
-   int got_some_input = 0;
+   bool got_some_input = 0;
    ptrdiff_t count = SPECPDL_INDEX ();
  
 +  eassert (wait_proc == NULL
 +         || EQ (wait_proc->thread, Qnil)
 +         || XTHREAD (wait_proc->thread) == current_thread);
 +
    FD_ZERO (&Available);
    FD_ZERO (&Writeok);
  

diff --cc src/process.h
Simple merge

diff --cc src/search.c
Simple merge

diff --cc src/window.c
Simple merge