changeset 109305:33b59bdb0ac4

Don't use `subprocesses' in msdos.c. msdos.c (syms_of_msdos) <delete-exited-processes>: Remove DEFVAR. (delete_exited_processes): Don't define. process.c (syms_of_process) <delete-exited-processes>: Define even if !subprocesses. (delete_exited_processes): Ditto.
author Eli Zaretskii <eliz@gnu.org>
date Sun, 11 Jul 2010 08:55:06 +0300
parents 2749a14ed325
children ccab121bb10f
files src/ChangeLog src/msdos.c src/process.c
diffstat 3 files changed, 13 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Jul 10 15:47:59 2010 -0400
+++ b/src/ChangeLog	Sun Jul 11 08:55:06 2010 +0300
@@ -1,3 +1,12 @@
+2010-07-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* process.c (syms_of_process) <delete-exited-processes>: Define
+	even if !subprocesses.
+	(delete_exited_processes): Ditto.
+
+	* msdos.c (syms_of_msdos) <delete-exited-processes>: Remove DEFVAR.
+	(delete_exited_processes): Don't define.
+
 2010-07-10  Chong Yidong  <cyd@stupidchicken.com>
 
 	* frame.c (make_frame): Initialize menu_bar_lines and
--- a/src/msdos.c	Sat Jul 10 15:47:59 2010 -0400
+++ b/src/msdos.c	Sun Jul 11 08:55:06 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);
--- a/src/process.c	Sat Jul 10 15:47:59 2010 -0400
+++ b/src/process.c	Sun Jul 11 08:55:06 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.