1 files changed, 17 insertions, 1 deletions

diff --git a/src/sysdep.c b/src/sysdep.c
index 5ee921df4cb..db3a747d8cc 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -346,7 +346,7 @@ wait_for_termination (pid)
           sigunblock (sigmask (SIGCHLD));
           break;
         }
-      sigpause (sigmask (SIGCHLD));
+      sigpause (SIGEMPTYMASK);
 #else /* not POSIX_SIGNALS */
 #ifdef HAVE_SYSV_SIGPAUSE
       sighold (SIGCHLD);
@@ -567,7 +567,11 @@ sys_suspend ()
 #else
 #ifdef SIGTSTP
 
+#ifdef GETPGRP_NO_ARG
+  EMACS_KILLPG (getpgrp (), SIGTSTP);
+#else
   EMACS_KILLPG (getpgrp (0), SIGTSTP);
+#endif
 
 #else /* No SIGTSTP */
 #ifdef USG_JOBCTRL /* If you don't know what this is don't mess with it */
@@ -1031,6 +1035,18 @@ init_sys_modes ()
 #ifdef VDSUSP /* Some systems have VDSUSP, some have V_DSUSP.  */
       tty.main.c_cc[VDSUSP] = CDISABLE;
 #endif /* VDSUSP */
+#ifdef VLNEXT
+      tty.main.c_cc[VLNEXT] = CDISABLE;
+#endif /* VLNEXT */
+#ifdef VREPRINT
+      tty.main.c_cc[VREPRINT] = CDISABLE;
+#endif /* VREPRINT */
+#ifdef VWERASE
+      tty.main.c_cc[VWERASE] = CDISABLE;
+#endif /* VWERASE */
+#ifdef VDISCARD
+      tty.main.c_cc[VDISCARD] = CDISABLE;
+#endif /* VDISCARD */
 #endif /* mips or HAVE_TCATTR */
 #ifdef AIX
 #ifndef IBMR2AIX