about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-09-06 21:35:37 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-09-06 21:35:37 +0000
commit817000920fe922cca3cfd8302c4aa26b9d608743 (patch)
tree144a3aac0548264137094c83a4bd2a4a808ba383
parent11385990339e7464466b4a83ae62e8149505bf75 (diff)
downloadzsh-817000920fe922cca3cfd8302c4aa26b9d608743.tar.gz
zsh-817000920fe922cca3cfd8302c4aa26b9d608743.tar.xz
zsh-817000920fe922cca3cfd8302c4aa26b9d608743.zip
27247: zmv checking for **/ was wrong
-rw-r--r--ChangeLog6
-rw-r--r--Functions/Misc/zmv2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8312c6c33..f81b9909b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-06  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* 27247: Functions/Misc/zmv: checking for "**/" was wrong.
+
 2009-09-05  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* Daniel Friesel <derf@tabularazor.org: 27244:
@@ -12121,5 +12125,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4768 $
+* $Revision: 1.4769 $
 *****************************************************
diff --git a/Functions/Misc/zmv b/Functions/Misc/zmv
index 0ff959d1f..86a8fce9c 100644
--- a/Functions/Misc/zmv
+++ b/Functions/Misc/zmv
@@ -187,7 +187,7 @@ if [[ -n $opt_w || -n $opt_W ]]; then
   # Well, this seems to work.
   # The tricky bit is getting all forms of [...] correct, but as long
   # as we require inactive bits to be backslashed its not so bad.
-  find='(#m)((\*\*#/|[*?]|<[0-9]#-[0-9]#>|\[(^|)(\]|)(\[:[a-z]##:\]|\\?|[^\]])##\])\##|?\###)'
+  find='(#m)((\*\*##/|[*?]|<[0-9]#-[0-9]#>|\[(^|)(\]|)(\[:[a-z]##:\]|\\?|[^\]])##\])\##|?\###)'
   tmp="${pat//${~find}/$[++cnt]}"
   if [[ $cnt = 0 ]]; then
     print -r -- "$myname: warning: no wildcards were found in search pattern" >&2