Adapt the MS-DOS build to the latest changes.

  msdos/mainmake.v2 (bootstrap-clean): Do a maintainer-clean in lib, not
  bootstrap-clean (which doesn't exist).
  msdos/inttypes.h (PRIuMAX) [__DJGPP__ < 2.04]: Define to "llu".
  msdos/sedleim.inp (MKDIR_P): Edit to DOS "md" command.
  msdos/sed1v2.inp: (LIB_CLOCK_GETTIME): Edit to empty.
  Remove lines that invoke PAXCTL.
  (clean): Fix recipe not to run Unixy shell commands.
  msdos/sed2v2.inp (GETTIMEOFDAY_TIMEZONE): Edit to 'struct timezone'.
  (HAVE_STRNCASECMP): Edit to 1.
  msdos/sed3v2.inp (LIB_CLOCK_GETTIME): Edit to empty.
  (C_SWITCH_SYSTEM): Add "-I../msdos".
  msdos/sedlibmk.inp (GNULIB_GETTIMEOFDAY, GNULIB_PSELECT)
  (GNULIB_SELECT, HAVE_STRUCT_TIMEVAL, HAVE_SYS_SELECT_H)
  (HAVE_SYS_TIME_H, NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H)
  (NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H, NEXT_SYS_SELECT_H)
  (NEXT_SYS_TIME_H, REPLACE_GETTIMEOFDAY, REPLACE_PSELECT)
  (REPLACE_STRUCT_TIMEVAL): Edit to appropriate values.
  (BUILT_SOURCES): Edit out sys/select.h and sys/time.h.
  (mostlyclean-local, distclean-generic): Fix recipe not to run
  Unixy shell commands.

  src/sysselect.h [DOS_NT]: Don't include sys/select.h.
  src/sysselect.h (pselect) [!HAVE_PSELECT]: Redirect to sys_select.
  src/sysdep.c: Don't include dos.h and dosfns.h.
  src/process.c (sys_select):
  src/msdos.c (sys_select): Accept one more argument and ignore it.
  src/msdos.c (event_timestamp, sys_select): Use gnulib's gettime;
  adapt data types and code to that.
  src/dosfns.c:
  src/msdos.c (gettime, settime): Define away the prototypes in dos.h,
  which clashes with the gnulib function of the same name.
  src/ w32proc.c (sys_select): Accept and ignore one more argument.
  src/w32.c (emacs_gnutls_pull): Call select with one more argument.

  lisp/emacs-lisp/timer.el (timer-until): Subtract results of
  float-time, instead of taking float-time of the result of
  time-subtract, since float-time signals an error for negative time
  arguments.

diff --cc lisp/ChangeLog
index 4d0f1e5afeb02607e05da2895b31af92e36b97fa,975478e1732a36c7ad0ec8b413431f6e7d31b5b9..ca425d5b5ea2faf312455375812c4c4f0ffa0d41
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,39 -1,10 +1,46 @@@
+ 2012-06-30  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * emacs-lisp/timer.el (timer-until): Subtract results of
+       float-time, instead of taking float-time of the result of
+       time-subtract, since float-time signals an error for negative time
+       arguments.
+ 
 +2012-06-30  Chong Yidong  <cyd@gnu.org>
 +
 +      * xml.el (xml-*-re): Convert defvars into defconsts, and
 +      eval-and-compile them so eval-and-compile works on derivatives.
 +      (xml--entity-replacement-text): Use eval-and-comple.
 +
 +2012-06-30  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * vc/vc-git.el (vc-git-registered): Use cache property
 +      `git-registered'.
 +      (vc-git-mode-line-string): Call `vc-working-revision' instead of
 +      `vc-git-working-revision' in order to benefit from the cache.
 +      (vc-git-root): Use cache property `git-root'.
 +
 +2012-06-30  Dmitry Gutov  <dgutov@yandex.ru>
 +
 +      * vc/vc-hooks.el (vc-before-save): Clear cache if file has been
 +      removed (likely outside Emacs).
 +
 +2012-06-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/cl-lib.el: Require macroexp for its macros.
 +
 +2012-06-30  Chong Yidong  <cyd@gnu.org>
 +
 +      * xml.el: Implement XML parameter entities.
 +      (xml-parameter-entity-alist): New variable.
 +      (xml-parse-region, xml-parse-fragment): Preserve previous values
 +      of xml-entity-alist and xml-parameter-entity-alist, so that
 +      repeated calls on different documents do not change them.
 +      (xml-parse-tag): Fix doctype regexp.
 +      (xml--entity-replacement-text): New function.
 +      (xml-parse-dtd): Use it.  Don't handle system entities; doing that
 +      properly requires url retrieval which is unimplemented.
 +      (xml-escape-string): Doc fix.
 +
  2012-06-30  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * emacs-lisp/cl-lib.el (cl-pushnew): Use macroexp-let2.

diff --cc src/ChangeLog
index ce817c19894acf17213736622bdaa19cc22fdc1b,c88007fd694f945a9399c64082df2ff5aaf12294..9794c5ad4cd8564469ad9f4afd6f51b6d426f8ef
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,14 -1,24 +1,39 @@@
+ 2012-06-30  Eli Zaretskii  <eliz@gnu.org>
+ 
++      * w32proc.c (sys_select): Accept and ignore one more argument.
++
++      * w32.c (emacs_gnutls_pull): Call select with one more argument.
++
+       * sysselect.h [DOS_NT]: Don't include sys/select.h.
+ 
+       * s/ms-w32.h (select, pselect): Don't define here, they are
+       defined in sysselect.h
+ 
+       * sysselect.h (pselect) [!HAVE_PSELECT]: Redirect to sys_select.
+ 
+       * sysdep.c: Don't include dos.h and dosfns.h.
+ 
+       * process.c (sys_select):
+       * msdos.c (sys_select): Accept one more argument and ignore it.
+ 
+       * msdos.c (event_timestamp, sys_select): Use gnulib's gettime;
+       adapt data types and code to that.
+ 
+       * dosfns.c:
+       * msdos.c (gettime, settime): Define away the prototypes in dos.h,
+       which clashes with the gnulib function of the same name.
+ 
 +2012-06-30  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +      * font.c (font_style_to_value, font_style_symbolic)
 +      (font_prop_validate_style): Add type checks for values in
 +      font_style_table.
 +
 +      * lisp.h (CHECK_RANGED_INTEGER): Make value to check the first
 +      argument.
 +      * character.c, charset.c, menu.c, process.c, window.c: Adjust all
 +      uses.
 +
  2012-06-29  Eli Zaretskii  <eliz@gnu.org>
  
        * xdisp.c (try_window_id): Undo last change.

diff --cc src/process.c
Simple merge

diff --cc src/s/ms-w32.h
index 38e368e5bd25e62d6e5d23672255d36d65f5e9da,9bfbde31065ebf567c7e5cd52885506ae22cdfab..3a95bffadb82cf425ee73b995c1ba98df09c7636
--- 1/src/s/ms-w32.h
--- 2/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@@ -233,8 -233,6 +233,8 @@@ struct sigaction 
  #define read    sys_read
  #define rename  sys_rename
  #define rmdir   sys_rmdir
- #define pselect  sys_select
 +#define select  sys_select
++#define pselect sys_select
  #define sleep   sys_sleep
  #define strerror sys_strerror
  #undef unlink

diff --cc src/sysselect.h
index 328372d427c5cd7a51ecb5b155f28df0ebe2f307,27a38fd687f04c7a220b0a7057186c8a2c796870..2dbbede2bffacc2a9bf48d5e0939288f5842641b
--- 1/src/sysselect.h
--- 2/src/sysselect.h
+++ b/src/sysselect.h
@@@ -52,3 -52,7 +52,7 @@@ along with GNU Emacs.  If not, see <htt
  #if !defined (HAVE_SELECT)
  #define select sys_select
  #endif
 -#ifndef HAVE_PSELECT
+ 
++#ifdef MSDOS
+ #define pselect sys_select
+ #endif

diff --cc src/w32.c
index 691d80a6313c8eee8905fbb86dc2b4904a8ab138,691d80a6313c8eee8905fbb86dc2b4904a8ab138..9f57a8d0e79e13042f20600bfc48035360ddcc13
--- 1/src/w32.c
--- 2/src/w32.c
+++ b/src/w32.c
@@@ -6312,7 -6312,7 +6312,7 @@@ emacs_gnutls_pull (gnutls_transport_ptr
  
            /* Use select with the timeout to poll the selector.  */
            sc = select (fd + 1, &fdset, (SELECT_TYPE *)0, (SELECT_TYPE *)0,
--                       &timeout);
++                       &timeout, NULL);
  
            if (sc > 0)
              continue;  /* Try again.  */

diff --cc src/w32proc.c
index 3864d15623a5db8aab5a170fff99f7d46fcf1d4a,3864d15623a5db8aab5a170fff99f7d46fcf1d4a..afc1b21fdde3cf09b5ef0bac76079801fc312743
--- 1/src/w32proc.c
--- 2/src/w32proc.c
+++ b/src/w32proc.c
@@@ -1080,7 -1080,7 +1080,7 @@@ extern int proc_buffered_char[]
  
  int
  sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
--          EMACS_TIME *timeout)
++          EMACS_TIME *timeout, void *ignored)
  {
    SELECT_TYPE orfds;
    DWORD timeout_ms, start_time;