diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Doc/Zsh/mod_mapfile.yo | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 6c3771271..72fc65195 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ can hear if you shriek. Treat exclamation marks as strings in "! -a ..." and "! -o ...". +2013-09-02 Peter Stephenson <p.stephenson@samsung.com> + + * 31685: Doc/Zsh/mod_mapfile.yo: documentation of how to get + lines from a file is not correct. + 2013-08-29 Peter Stephenson <p.stephenson@samsung.com> * users/17955: Doc/Zsh/contrib.yo, diff --git a/Doc/Zsh/mod_mapfile.yo b/Doc/Zsh/mod_mapfile.yo index 98114aea2..96e056816 100644 --- a/Doc/Zsh/mod_mapfile.yo +++ b/Doc/Zsh/mod_mapfile.yo @@ -28,9 +28,12 @@ referenced may not be written or deleted. A file may conveniently be read into an array as one line per element with the form -`var(array)tt(=LPAR()"${(f)mapfile[)var(filename)tt(]}"RPAR())'. -The double quotes are necessary to prevent empty lines from being -removed. +`var(array)tt(=LPAR()"${(f@)mapfile[)var(filename)tt(]}"RPAR())'. +The double quotes and the `tt(@)' are necessary to prevent empty lines +from being removed. Note that if the file ends with a newline, +the shell will split on the final newline, generating an additional +empty field; this can be suppressed by using +`var(array)tt(=LPAR()"${(f@)${mapfile[)var(filename)tt(]%$'\n'}}"RPAR())'. ) enditem() |