From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 11 Jul 2010 05:55:06 +0000 (+0300)
Subject: Don't use `subprocesses' in msdos.c.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~78^2~15
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=462aa963ef0f9d209b611fca59fa697486f5f833;p=emacs.git

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.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 404af1949e9..a7c8a9844f1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
diff --git a/src/msdos.c b/src/msdos.c
index c1c838375e6..8bfdce22fcd 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -4701,13 +4701,6 @@ abort (void)
 }
 #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)
 {
@@ -4725,12 +4718,6 @@ syms_of_msdos (void)
 This variable is used only by MS-DOS terminals.  */);
   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);
diff --git a/src/process.c b/src/process.c
index 55f46e2422d..f4cebbf777a 100644
--- a/src/process.c
+++ b/src/process.c
@@ -310,6 +310,9 @@ Lisp_Object QCname, QCtype;
 
 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 @@ static int max_keyboard_desc;
 /* 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 @@ syms_of_process (void)
   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.