summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <p.w.stephenson@ntlworld.com>2013-10-19 23:09:07 +0100
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2013-10-19 23:09:07 +0100
commit610f376f4d3c119c27076afca0edcf99ef53b428 (patch)
tree75c8aeb2b1b70db3432717b48cf05c2ab62959d9
parent9a044f1a6ad4ecfdfeff2f89e1685a1d622cb029 (diff)
parentada42926b14b9718b853b3713b02a836f944959d (diff)
downloadzsh-610f376f4d3c119c27076afca0edcf99ef53b428.tar.gz
zsh-610f376f4d3c119c27076afca0edcf99ef53b428.tar.xz
zsh-610f376f4d3c119c27076afca0edcf99ef53b428.zip
Fix merge conflict
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/params.yo6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 64b4b9861..3064963d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* 31851: Src/exec.c: execstring() should display string to
 	be executed with VERBOSE option.
 
+2013-10-19  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 31849: Doc/Zsh/params.yo: note effect of KSH_ZERO_SUBSCRIPT
+	on the arrays of positional parameters e.g. ${argv[0]} vs. $0
+
 2013-10-18  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 31846: Src/exec.c: fix NOEXEC option in execsimple().
diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index 97087a1c5..9d951bb38 100644
--- a/Doc/Zsh/params.yo
+++ b/Doc/Zsh/params.yo
@@ -431,9 +431,15 @@ of a shell function, shell script, or the shell itself; see
 noderef(Invocation), and also noderef(Functions).
 The parameter var(n), where var(n) is a number,
 is the var(n)th positional parameter.
+The parameter `tt($0)' is a special case, see
+noderef(Parameters Set By The Shell).
+
 The parameters tt(*), tt(@) and tt(argv) are
 arrays containing all the positional parameters;
 thus `tt($argv[)var(n)tt(])', etc., is equivalent to simply `tt($)var(n)'.
+Note that the options tt(KSH_ARRAYS) or tt(KSH_ZERO_SUBSCRIPT) apply
+to these arrays as well, so with either of those options set,
+`tt(${argv[0]})' is equivalent to `tt($1)' and so on.
 
 Positional parameters may be changed after the shell or function starts by
 using the tt(set) builtin, by assigning to the tt(argv) array, or by direct