[Emacs-diffs] /srv/bzr/emacs/trunk r100772: Don't use `subprocesses' in msdos.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100772 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2010-07-11 08:57:52 +0300
message:
  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.
modified:
  src/ChangeLog
  src/msdos.c
  src/process.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-10 19:01:01 +0000
+++ b/src/ChangeLog     2010-07-11 05:55:06 +0000
@@ -1,3 +1,12 @@
+2010-07-11  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * frame.c (make_frame): Initialize menu_bar_lines and

=== modified file 'src/msdos.c'
--- a/src/msdos.c       2010-07-10 18:56:47 +0000
+++ b/src/msdos.c       2010-07-11 05:55:06 +0000
@@ -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);

=== modified file 'src/process.c'
--- a/src/process.c     2010-07-10 13:26:44 +0000
+++ b/src/process.c     2010-07-11 05:55:06 +0000
@@ -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.