24 lines
757 B
Diff
24 lines
757 B
Diff
diff -Naur a/trap.c b/trap.c
|
|
--- a/trap.c 2014-02-05 19:03:21.000000000 +0400
|
|
+++ b/trap.c 2014-03-13 16:36:11.521400000 +0400
|
|
@@ -920,7 +920,8 @@
|
|
subst_assign_varlist = 0;
|
|
|
|
#if defined (JOB_CONTROL)
|
|
- save_pipeline (1); /* XXX only provides one save level */
|
|
+ if (sig != DEBUG_TRAP) /* run_debug_trap does this */
|
|
+ save_pipeline (1); /* XXX only provides one save level */
|
|
#endif
|
|
|
|
/* If we're in a function, make sure return longjmps come here, too. */
|
|
@@ -940,7 +941,8 @@
|
|
trap_exit_value = last_command_exit_value;
|
|
|
|
#if defined (JOB_CONTROL)
|
|
- restore_pipeline (1);
|
|
+ if (sig != DEBUG_TRAP) /* run_debug_trap does this */
|
|
+ restore_pipeline (1);
|
|
#endif
|
|
|
|
subst_assign_varlist = save_subst_varlist;
|