merge trunk

diff --cc src/ChangeLog
index 4fe34cb59442986e7f22ef8d2f55bec50d692b63,e8567d64245784a235cfa36838eb63141bbc99f6..7493132858584e62b652f17c0cf2e0a1df0acb72
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,33 +1,39 @@@
 +2010-07-14  Kenichi Handa  <handa@m17n.org>
 +
 +      * font.c (font_open_entity): Cancel previous change.
 +      (Ffont_get): Don't check FONT_ENTITY_INDEX of a font-object.
 +
+ 2010-07-13  Eli Zaretskii  <eliz@gnu.org>
+ 
+       Remove subprocesses #ifdefs.
+       * process.c <inhibit_sentinels>: Move to the common part.
+       (Fwaiting_for_user_input_p): Move to the common part; return nil
+       if async subprocesses aren't supported.
+       * sysdep.c (wait_for_termination) [!MSDOS]: Don't compile on
+       MS-DOS.  Remove "#ifdef subprocesses".
+       (sys_subshell, sys_select): Remove "#ifdef subprocesses".
+       (gettimeofday): Remove "#ifdef subprocesses".
+       (wait_without_blocking): Remove function.
+       (flush_pending_output, child_setup_tty): Don't compile on MS-DOS.
+       Remove "#ifdef subprocesses".
+       (child_setup_tty): Use WINDOWSNT instead of DOS_NT, since not
+       compiled on MS-DOS.
+       * callproc.c (Fcall_process) [!MSDOS]: Don't call
+       wait_for_termination on MS-DOS.
+       * emacs.c (shut_down_emacs): Remove "#ifndef subprocesses" from
+       initialization of inhibit_sentinels.
+       * keyboard.c (record_asynch_buffer_change): Remove "#ifdef
+       subprocesses" conditional.
+       * callproc.c (Fcall_process) [!subprocesses]: Don't call
+       wait_for_termination, since `buffer' cannot be an integer when
+       async subprocesses are not supported
+       * xdisp.c (decode_mode_spec): Use `MSDOS' instead of `subprocesses'
+       for ifdefing away the call to Fprocess_status.
+ 
+       * process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef
+       away the entire body of the function.
++>>>>>>> MERGE-SOURCE
+ 
  2010-07-13  Dan Nicolaescu  <dann@ics.uci.edu>
  
        Remove subprocesses #ifdefs from term.c.