From 84584ea58bf0a8f58ed0dcd30d769adffa3377f7 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Thu, 25 Sep 2008 11:26:00 +0000 Subject: 25684: make %x and %I consistent with eval line numbering --- Src/prompt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Src/prompt.c') diff --git a/Src/prompt.c b/Src/prompt.c index 7bba51c61..870632ec5 100644 --- a/Src/prompt.c +++ b/Src/prompt.c @@ -726,7 +726,8 @@ putpromptchar(int doprint, int endchar, unsigned int *txtchangep) stradd(Rstring); break; case 'I': - if (funcstack && funcstack->tp != FS_SOURCE) { + if (funcstack && funcstack->tp != FS_SOURCE && + (!intrap || trapisfunc)) { /* * We're in a function or an eval with * EVALLINENO. Calculate the line number in @@ -749,7 +750,8 @@ putpromptchar(int doprint, int endchar, unsigned int *txtchangep) bp += strlen(bp); break; case 'x': - if (funcstack && funcstack->tp != FS_SOURCE) + if (funcstack && funcstack->tp != FS_SOURCE && + (!intrap || trapisfunc)) promptpath(funcstack->filename ? funcstack->filename : "", arg, 0); else -- cgit 1.4.1