summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Doc/Zsh/builtins.yo5
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 194cb3128..3ff306d4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2017-02-13  Peter Stephenson  <p.stephenson@samsung.com>
 
+	* 40537: Doc/Zsh/builtins.yo: document the foregoing.
+
 	* Sebastian: 40536: Src/builtin.c, Src/zsh.h: prepend directory
 	of function autoload with absolute path to fpath if loading a
 	function by relative path.
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index 0a9021cb0..bdd1ad1bb 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -159,7 +159,10 @@ load from the file given (searching as usual for dump files in the given
 location).  The name of the function is the basename (non-directory
 part) of the file.  It is normally an error if the function is not found
 in the given location; however, if the option tt(-d) is given, searching
-for the function defaults to tt($fpath).
+for the function defaults to tt($fpath).  If a function is loaded by
+absolute path, any functions loaded from it that are marked for
+tt(autoload) without an absolute path have the load path of the parent
+function temporarily prepended to tt($fpath).
 
 If the option tt(-r) or tt(-R) is given, the function is searched for
 immediately and the location is recorded internally for use when the