# HG changeset patch # User Eli Zaretskii # Date 1278827872 -10800 # Node ID ccab121bb10f5eeb6317ed6dd09200edfed6197e # Parent 2749a14ed3255f0dda1f721199826ecb240e51cd# Parent 33b59bdb0ac429ac44e592489c3ed2a5f96615b0 Don't use `subprocesses' in msdos.c. msdos.c (syms_of_msdos) : Remove DEFVAR. (delete_exited_processes): Don't define. process.c (syms_of_process) : Define even if !subprocesses. (delete_exited_processes): Ditto. diff -r 2749a14ed325 -r ccab121bb10f src/ChangeLog --- a/src/ChangeLog Sat Jul 10 15:47:59 2010 -0400 +++ b/src/ChangeLog Sun Jul 11 08:57:52 2010 +0300 @@ -1,3 +1,12 @@ +2010-07-11 Eli Zaretskii + + * process.c (syms_of_process) : Define + even if !subprocesses. + (delete_exited_processes): Ditto. + + * msdos.c (syms_of_msdos) : Remove DEFVAR. + (delete_exited_processes): Don't define. + 2010-07-10 Chong Yidong * frame.c (make_frame): Initialize menu_bar_lines and diff -r 2749a14ed325 -r ccab121bb10f src/msdos.c --- a/src/msdos.c Sat Jul 10 15:47:59 2010 -0400 +++ b/src/msdos.c Sun Jul 11 08:57:52 2010 +0300 @@ -4701,13 +4701,6 @@ } #endif -/* The following variables are required so that cus-start.el won't - complain about unbound variables. */ -#ifndef subprocesses -/* Nonzero means delete a process right away if it exits (process.c). */ -static int delete_exited_processes; -#endif - void syms_of_msdos (void) { @@ -4726,12 +4719,6 @@ Vdos_unsupported_char_glyph = make_number ('\177'); #endif -#ifndef subprocesses - DEFVAR_BOOL ("delete-exited-processes", &delete_exited_processes, - doc: /* *Non-nil means delete processes immediately when they exit. -A value of nil means don't delete them until `list-processes' is run. */); - delete_exited_processes = 0; -#endif defsubr (&Srecent_doskeys); defsubr (&Smsdos_long_file_names); diff -r 2749a14ed325 -r ccab121bb10f src/process.c --- a/src/process.c Sat Jul 10 15:47:59 2010 -0400 +++ b/src/process.c Sun Jul 11 08:57:52 2010 +0300 @@ -310,6 +310,9 @@ static int kbd_is_on_hold; +/* Nonzero means delete a process right away if it exits. */ +static int delete_exited_processes; + #ifdef subprocesses /* Mask of bits indicating the descriptors that we wait for input on. */ @@ -352,9 +355,6 @@ /* The largest descriptor currently in use for gpm mouse input. */ static int max_gpm_desc; -/* Nonzero means delete a process right away if it exits. */ -static int delete_exited_processes; - /* Indexed by descriptor, gives the process (if any) for that descriptor */ Lisp_Object chan_process[MAXDESC]; @@ -7667,13 +7667,13 @@ Qargs = intern_c_string ("args"); staticpro (&Qargs); -#ifdef subprocesses DEFVAR_BOOL ("delete-exited-processes", &delete_exited_processes, doc: /* *Non-nil means delete processes immediately when they exit. A value of nil means don't delete them until `list-processes' is run. */); delete_exited_processes = 1; +#ifdef subprocesses DEFVAR_LISP ("process-connection-type", &Vprocess_connection_type, doc: /* Control type of device used to communicate with subprocesses. Values are nil to use a pipe, or t or `pty' to use a pty.