Subject: [PATCH] Make 'whence -v autoloaded-function' shows the defining filename.
From: Daniel Shahaf <[email-masked]>
To: [email-masked]
Date: Thu, 4 Aug 2016 15:53:27 +0000
List-Id: Zsh Workers List <zsh-workers.zsh.org>

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