From e3fd25b18198709348af195dedadaceb88feb568 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Mon, 29 Sep 2008 21:46:58 +0000 Subject: 25775: fix logical problem with function line numbering inside eval-style traps --- Src/prompt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Src/prompt.c') diff --git a/Src/prompt.c b/Src/prompt.c index 870632ec5..80547e419 100644 --- a/Src/prompt.c +++ b/Src/prompt.c @@ -727,7 +727,7 @@ putpromptchar(int doprint, int endchar, unsigned int *txtchangep) break; case 'I': if (funcstack && funcstack->tp != FS_SOURCE && - (!intrap || trapisfunc)) { + !IN_EVAL_TRAP()) { /* * We're in a function or an eval with * EVALLINENO. Calculate the line number in @@ -751,7 +751,7 @@ putpromptchar(int doprint, int endchar, unsigned int *txtchangep) break; case 'x': if (funcstack && funcstack->tp != FS_SOURCE && - (!intrap || trapisfunc)) + !IN_EVAL_TRAP()) promptpath(funcstack->filename ? funcstack->filename : "", arg, 0); else -- cgit 1.4.1