summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--Doc/Zsh/expn.yo19
2 files changed, 16 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 59a18dc36..e8625ca6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,9 @@
 2011-08-14  Mikael Magnusson  <mikachu@gmail.com>
 
-	* 29673: Doc/Zsh/compsys.yo: Clarify what 'other' in the
+	* 29673: Doc/Zsh/compsys.yo: clarify what 'other' in the
 	ignore-line style does.
 
-	* 28852: Misc/zargs, Zle/match-words-by-style: Use syntax that
+	* 28852: Misc/zargs, Zle/match-words-by-style: use syntax that
 	doesn't depend on SHORT_LOOPS being set.
 
 	* unposted: Src/hist.c: fix a typo in a comment.
@@ -14,6 +14,9 @@
 	* 29388, 29680: Doc/Zsh/expn.yo: clarify note about e:string:
 	quoting.
 
+	* 29504: Doc/Zsh/expn.yo: note when (#cN,M) can't be used in
+	place of # or ##.
+
 2011-08-14  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 29677: Src/exec.c, Src/signals.c, Src/zsh.h: flag jobs that are
@@ -15257,5 +15260,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5428 $
+* $Revision: 1.5429 $
 *****************************************************
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index 4c85d3119..adbc662e6 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -1999,15 +1999,16 @@ point on.
 )
 item(tt(c)var(N)tt(,)var(M))(
 The flag tt(LPAR()#c)var(N)tt(,)var(M)tt(RPAR()) can be used anywhere
-that the tt(#) or tt(##) operators can be used; it cannot be combined
-with other globbing flags and a bad pattern error occurs if it is
-misplaced.  It is equivalent to the form tt({)var(N)tt(,)var(M)tt(}) in
-regular expressions.  The previous character or group is required to
-match between var(N) and var(M) times, inclusive.  The form
-tt(LPAR()#c)var(N)tt(RPAR()) requires exactly tt(N) matches;
-tt(LPAR()#c,)var(M)tt(RPAR()) is equivalent to specifying var(N) as 0;
-tt(LPAR()#c)var(N)tt(,RPAR()) specifies that there is no maximum limit
-on the number of matches.
+that the tt(#) or tt(##) operators can be used except in the expressions
+`tt((*/)#)' and `tt((*/)##)' in filename generation, where `tt(/)'
+has special meaning; it cannot be combined with other globbing flags and
+a bad pattern error occurs if it is misplaced.  It is equivalent to the
+form tt({)var(N)tt(,)var(M)tt(}) in regular expressions.  The previous
+character or group is required to match between var(N) and var(M) times,
+inclusive.  The form tt(LPAR()#c)var(N)tt(RPAR()) requires exactly tt(N)
+matches; tt(LPAR()#c,)var(M)tt(RPAR()) is equivalent to specifying var(N)
+as 0; tt(LPAR()#c)var(N)tt(,RPAR()) specifies that there is no maximum
+limit on the number of matches.
 )
 item(tt(m))(
 Set references to the match data for the entire string matched; this is