*** empty log message ***

[bpt/emacs.git] / src / sysdep.c

diff --git a/src/sysdep.c b/src/sysdep.c
index 5f528f0..69dad60 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -58,8 +58,6 @@ static int delete_exited_processes;
 #endif
 #endif  /* macintosh */
 
-#define min(x,y) ((x) > (y) ? (y) : (x))
-
 #ifdef WINDOWSNT
 #define read sys_read
 #define write sys_write
@@ -590,6 +588,13 @@ child_setup_tty (out)
 #endif
   s.main.c_lflag &= ~ECHO;     /* Disable echo */
   s.main.c_lflag |= ISIG;      /* Enable signals */
+#if 0
+  s.main.c_iflag &= ~ICRNL;    /* Disable map of CR to NL on input */
+#ifdef INLCR  /* Just being cautious, since I can't check how
+                widespread INLCR is--rms.  */
+  s.main.c_iflag &= ~INLCR;    /* Disable map of NL to CR on input */
+#endif
+#endif
 #ifdef IUCLC
   s.main.c_iflag &= ~IUCLC;    /* Disable downcasing on input.  */
 #endif
@@ -1291,8 +1296,8 @@ init_sys_modes ()
 /* cus-start.el complains if delete-exited-processes is not defined */
 #ifndef subprocesses
   DEFVAR_BOOL ("delete-exited-processes", &delete_exited_processes,
-    "*Non-nil means delete processes immediately when they exit.\n\
-nil means don't delete them until `list-processes' is run.");
+              doc: /* *Non-nil means delete processes immediately when they exit.
+nil means don't delete them until `list-processes' is run.  */);
   delete_exited_processes = 0;
 #endif
 #endif /* not macintosh */
@@ -2024,7 +2029,7 @@ wait_for_kbd_input ()
       /* No timing error: wait for flag to be set.  */
       set_waiting_for_input (0);
       SYS$WFLOR (input_ef, input_eflist);
-      clear_waiting_for_input (0);
+      clear_waiting_for_input ();
       if (!detect_input_pending ())
        /* Check for subprocess input availability */
        {