diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-09-29 21:46:58 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-09-29 21:46:58 +0000 |
| commit | e3fd25b18198709348af195dedadaceb88feb568 (patch) | |
| tree | c79923638294a83398fdda1aef2698deafef0399 /Src/prompt.c | |
| parent | 29db898a6d5eb41b4e3c8624bd1356d02571f5f0 (diff) | |
| download | zsh-e3fd25b18198709348af195dedadaceb88feb568.tar.gz zsh-e3fd25b18198709348af195dedadaceb88feb568.zip | |
25775: fix logical problem with function line numbering inside eval-style traps
Diffstat (limited to 'Src/prompt.c')
| -rw-r--r-- | Src/prompt.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 |