* [PATCH] Make 'whence -v autoloaded-function' shows the defining filename.
@ 2016-08-04 15:53 Daniel Shahaf
0 siblings, 0 replies; only message in thread
From: Daniel Shahaf @ 2016-08-04 15:53 UTC (permalink / raw)
To: zsh-workers
This may also fix a problem whereby the %x prompt escape evaluated to
a function name rather than a filename, since %x is also backed by
scriptfilename.
---
Src/exec.c | 3 ++-
Test/C04funcdef.ztst | 10 ++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Src/exec.c b/Src/exec.c
index 515406f..ea9214d 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -4915,7 +4915,8 @@ execautofn_basic(Estate state, UNUSED(int do_exec))
oldscriptname = scriptname;
oldscriptfilename = scriptfilename;
- scriptname = scriptfilename = dupstring(shf->node.nam);
+ scriptname = dupstring(shf->node.nam);
+ scriptfilename = dupstring(shf->filename);
execode(shf->funcdef, 1, 0, "loadautofunc");
scriptname = oldscriptname;
scriptfilename = oldscriptfilename;
diff --git a/Test/C04funcdef.ztst b/Test/C04funcdef.ztst
index 496577f..9f15e04 100644
--- a/Test/C04funcdef.ztst
+++ b/Test/C04funcdef.ztst
@@ -321,6 +321,16 @@
> print oops was successfully autoloaded
>}
+ (
+ fpath=(.)
+ printf '%s\n' 'oops(){}' 'ninjas-earring(){}' 'oops "$@"' >oops
+ autoload oops
+ oops
+ whence -v oops
+ )
+0:whence -v of zsh-style autoload
+>oops is a shell function from ./oops
+
%clean
rm -f file.in file.out
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-08-04 15:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-04 15:53 [PATCH] Make 'whence -v autoloaded-function' shows the defining filename Daniel Shahaf
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).