From 640bbab78f56c2a51fb3ee1d0f83e3bf0418d8be Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Thu, 29 Jul 2004 15:09:51 +0000
Subject: 20221: $LINENO in trap '...' DEBUG was wrong.

---
 Src/exec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Src/exec.c')

diff --git a/Src/exec.c b/Src/exec.c
index ee0752035..d1c3bb98e 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -787,7 +787,8 @@ execsimple(Estate state)
     if (errflag)
 	return (lastval = 1);
 
-    if (code)
+    /* In evaluated traps, don't modify the line number. */
+    if ((!intrap || trapisfunc) && code)
 	lineno = code - 1;
 
     code = wc_code(*state->pc++);
@@ -1258,7 +1259,8 @@ execpline2(Estate state, wordcode pcode,
     if (breaks || retflag)
 	return;
 
-    if (WC_PIPE_LINENO(pcode))
+    /* In evaluated traps, don't modify the line number. */
+    if ((!intrap || trapisfunc) && WC_PIPE_LINENO(pcode))
 	lineno = WC_PIPE_LINENO(pcode) - 1;
 
     if (pline_level == 1) {
-- 
cgit 1.4.1