about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Doc/Zsh/expn.yo9
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4aa15f6f6..93894f290 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2020-07-12  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
+	* users/24985: Doc/Zsh/expn.yo: Clarify documentation of the
+	${(n)} and ${(-)} parameter expansion flags, and add a forward
+	compatibility hatch to the latter.
+
 	* 46204: Test/E01options.ztst: Fix new test case for the
 	theoretical case of having more than 100 files in the root
 	directory.
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index 41ad967b2..21ecf9d6e 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -1092,15 +1092,18 @@ Convert all letters in the result to lower case.
 item(tt(n))(
 Sort decimal integers numerically; if the first differing
 characters of two test strings are not digits, sorting
-is lexical.   Integers with more initial zeroes
-are sorted before those with fewer or none.  Hence the array `tt(foo1 foo02
+is lexical.  `tt(+)' and `tt(-)' are not treated specially; they are treated as
+any other non-digit.  Integers with more initial zeroes
+are sorted before those with fewer or none.  Hence the array `tt(foo+24 foo1 foo02
 foo2 foo3 foo20 foo23)' is sorted into the order shown.
 May be combined with `tt(i)' or `tt(O)'.
 )
 item(tt(-))(
 As tt(n), but a leading minus sign indicates a negative decimal
-integer.  A `tt(-)' not followed by an integer does not trigger
+integer.  A leading minus sign not followed by an integer does not trigger
 numeric sorting.
+Note that `tt(+)' signs are not handled specially (this may change in the
+future).
 )
 item(tt(o))(
 Sort the resulting words in ascending order; if this appears on its