about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Cook <llua@gmx.com>2016-06-05 12:05:34 -0400
committerEric Cook <illua@users.sourceforge.net>2016-06-05 12:05:34 -0400
commitcabacfff3b5485b1cee53674640dce29214cdd44 (patch)
tree9a7dd52ba35d861cc1719f6b7c0e7655fb88b144
parent3a6a6fda8a7034151a888cb09ff38ebd2dc2dad2 (diff)
downloadzsh-cabacfff3b5485b1cee53674640dce29214cdd44.tar.gz
zsh-cabacfff3b5485b1cee53674640dce29214cdd44.tar.xz
zsh-cabacfff3b5485b1cee53674640dce29214cdd44.zip
38547: Completion/compdump: only autoload functions when they exist in fpath
-rw-r--r--ChangeLog4
-rw-r--r--Completion/compdump5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f64b6c91..24d46a482 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-04  Eric Cook <llua@gmx.com>
+	* 38547: Completion/compdump: only autoload functions
+	when they exist in fpath.
+
 2016-06-04  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* 38593: Doc/Zsh/compsys.yo: _describe: Make documentation
diff --git a/Completion/compdump b/Completion/compdump
index 068383c22..e0dc8b805 100644
--- a/Completion/compdump
+++ b/Completion/compdump
@@ -101,9 +101,10 @@ bindkey |
 print >> $_d_file
 
 
-# Autoloads: look for all functions beginning with `_'.
+# Autoloads: look for all defined functions beginning with `_' (that also
+# exists in fpath: see workers/38547).
 
-_d_als=(${(o)$(typeset +fm '_*')})
+_d_als=($^fpath/(${(o~j.|.)$(typeset +fm '_*')})(N:t))
 
 # print them out:  about five to a line looks neat