diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 575c05bba3..3845703360 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
 Wed Aug 31 09:17:02 1994  Jim Kingdon  (kingdon@cygnus.com)
 
+	* inflow.c (set_sigint_trap, clear_sigint_trap): Check for
+	attach_flag (this check was performed by the callers).  Also check
+	inferior_thisrun_terminal.
+	* inftarg.c (child_wait), lynx-nat.c (child_wait),
+	procfs.c (wait_fd), symm-nat.c (child_wait): Don't check
+	attach_flag in deciding whether to call set_sigint_trap and
+	clear_sigint_trap. 
+
 	* value.h (struct value): Change literal_data from PTR to char *,
 	since that is the way it is used.
 
diff --git a/gdb/lynx-nat.c b/gdb/lynx-nat.c
index 3d7c92d9eb..95a3d9164e 100644
--- a/gdb/lynx-nat.c
+++ b/gdb/lynx-nat.c
@@ -603,8 +603,7 @@ child_wait (pid, ourstatus)
     {
       int sig;
 
-      if (attach_flag)
-	set_sigint_trap();	/* Causes SIGINT to be passed on to the
+      set_sigint_trap();	/* Causes SIGINT to be passed on to the
 				   attached process. */
       pid = wait (&status);
 #ifdef SPARC
@@ -614,8 +613,7 @@ child_wait (pid, ourstatus)
 
       save_errno = errno;
 
-      if (attach_flag)
-	clear_sigint_trap();
+      clear_sigint_trap();
 
       if (pid == -1)
 	{
diff --git a/gdb/procfs.c b/gdb/procfs.c
index d9891b421a..5d3ed272c8 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -570,8 +570,7 @@ wait_fd ()
   int num_fds;
   int i;
 
-  if (attach_flag)
-    set_sigint_trap ();	/* Causes SIGINT to be passed on to the
+  set_sigint_trap ();	/* Causes SIGINT to be passed on to the
 			   attached process. */
   set_sigio_trap ();
 
@@ -597,8 +596,7 @@ wait_fd ()
   pi->had_event = 1;
 #endif  
   
-  if (attach_flag)
-    clear_sigint_trap();
+  clear_sigint_trap ();
   clear_sigio_trap ();
 
 #ifndef LOSING_POLL
diff --git a/gdb/symm-nat.c b/gdb/symm-nat.c
index 66183aa7d6..6f235bd27c 100644
--- a/gdb/symm-nat.c
+++ b/gdb/symm-nat.c
@@ -402,9 +402,8 @@ child_wait(pid, status)
 #endif
 
   do {
-    if (attach_flag)
-      set_sigint_trap();	/* Causes SIGINT to be passed on to the
-				   attached process. */
+    set_sigint_trap();	/* Causes SIGINT to be passed on to the
+			   attached process. */
     save_errno = errno;
 
     got_sigchld = 0;
@@ -415,8 +414,7 @@ child_wait(pid, status)
 	    sigsuspend(&set);
     }
     
-    if (attach_flag)
-      clear_sigint_trap();
+    clear_sigint_trap();
 
     rv = mptrace(XPT_STOPSTAT, 0, (char *)&pt, 0);
     if (-1 == rv) {