summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <p.stephenson@samsung.com>2022-03-24 10:35:29 +0000
committerPeter Stephenson <p.stephenson@samsung.com>2022-03-24 10:35:29 +0000
commit587793f818be06ad10d31e6692982c1783ed49fd (patch)
treeb9023b5ebc3916fd24f21b67e801faf5bfd0c3cf
parent78649ac72596104cfcbaad9a5a7d1a1afa981a4c (diff)
downloadzsh-587793f818be06ad10d31e6692982c1783ed49fd.tar.gz
zsh-587793f818be06ad10d31e6692982c1783ed49fd.tar.xz
zsh-587793f818be06ad10d31e6692982c1783ed49fd.zip
49845: man page clarification on option scope
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/options.yo3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f915fbae5..4f82451e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-03-24  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 49845: Doc/Zsh/options.yo: clarify that options can be local
+	in function scope.
+
 2022-03-18  Matthew Martin  <phy1729@gmail.com>
 
 	* 49852: Completion/BSD/Command/_pfctl,
diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo
index cf4600769..443676b78 100644
--- a/Doc/Zsh/options.yo
+++ b/Doc/Zsh/options.yo
@@ -41,6 +41,9 @@ will be treated just as `tt(-f)', but the string `tt(-f i)' is an error.
 This is because many systems which implement the `tt(#!)' mechanism for
 calling scripts do not strip trailing whitespace.
 
+It is possible for options to be set within a function scope.  See the
+description of the option tt(LOCAL_OPTIONS) below.
+
 texinode(Description of Options)(Option Aliases)(Specifying Options)(Options)
 sect(Description of Options)
 cindex(options, description)