about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-02-12 09:56:25 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-02-12 09:56:25 +0000
commit9e51292273f042ba1a3a7630c8557c2208ef9241 (patch)
tree0bd713f1b3cd54c7a6ffb5f9845797f618ce0c17
parentc7d8b0dfb8ae9670e2bc11ecf563200069a3a12f (diff)
downloadzsh-9e51292273f042ba1a3a7630c8557c2208ef9241.tar.gz
zsh-9e51292273f042ba1a3a7630c8557c2208ef9241.tar.xz
zsh-9e51292273f042ba1a3a7630c8557c2208ef9241.zip
26560: document autoload -z/-k (finally)
-rw-r--r--ChangeLog6
-rw-r--r--Doc/Zsh/builtins.yo5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 20cf6ea4d..6448681aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-12  Peter Stephenson  <pws@csr.com>
+
+	* 26560: Doc/Zsh/builtins.yo: document autoload -z/-k (finally).
+
 2009-02-11  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 26556: Doc/Zsh/builtins.yo: documentation for 26546.
@@ -11167,5 +11171,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4563 $                         
+* $Revision: 1.4564 $                         
 *****************************************************
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index 1d74d7f49..d08e3bd90 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -131,6 +131,11 @@ ksh autoloading behaviour on the first call to the function.
 With the tt(-w) flag, the var(name)s are taken as names of files compiled
 with the tt(zcompile) builtin, and all functions defined in them are
 marked for autoloading.
+
+The flags tt(-z) and tt(-k) mark the function to be autoloaded in
+native or ksh emulation, as if the option tt(KSH_AUTOLOAD) were
+unset or were set, respectively.  The flags override the setting of
+the option at the time the function is loaded.
 )
 findex(bg)
 cindex(jobs, backgrounding)