mirror of
git://git.code.sf.net/p/zsh/code
synced 2024-05-20 23:16:04 +02:00
users/29160, workers/52156: Fix repetition of substitution modifier.
This commit is contained in:
parent
f72757ccf3
commit
1becbba0b6
|
@ -1,5 +1,9 @@
|
||||||
2023-09-16 Bart Schaefer <schaefer@zsh.org>
|
2023-09-16 Bart Schaefer <schaefer@zsh.org>
|
||||||
|
|
||||||
|
* 52156: Test/E01options.ztst: Test case for user/29160.
|
||||||
|
|
||||||
|
* users/29160: Src/subst.c: Fix repetition of substituion modifier.
|
||||||
|
|
||||||
* Christoffer Lundell: 52082: Functions/Zle/edit-command-line:
|
* Christoffer Lundell: 52082: Functions/Zle/edit-command-line:
|
||||||
Enable linewise edit-command when in visual-line mode.
|
Enable linewise edit-command when in visual-line mode.
|
||||||
|
|
||||||
|
|
|
@ -4689,7 +4689,8 @@ modify(char **str, char **ptr, int inbrace)
|
||||||
case 'S':
|
case 'S':
|
||||||
hsubpatopt = (c == 'S');
|
hsubpatopt = (c == 'S');
|
||||||
if (hsubl && hsubr)
|
if (hsubl && hsubr)
|
||||||
subst(©, hsubl, hsubr, gbal, hsubpatopt);
|
subst(©, dupstring(hsubl), dupstring(hsubr),
|
||||||
|
gbal, hsubpatopt);
|
||||||
break;
|
break;
|
||||||
case 'q':
|
case 'q':
|
||||||
copy = quotestring(copy, QT_BACKSLASH_SHOWNULL);
|
copy = quotestring(copy, QT_BACKSLASH_SHOWNULL);
|
||||||
|
@ -4777,7 +4778,8 @@ modify(char **str, char **ptr, int inbrace)
|
||||||
case 'S':
|
case 'S':
|
||||||
hsubpatopt = (c == 'S');
|
hsubpatopt = (c == 'S');
|
||||||
if (hsubl && hsubr)
|
if (hsubl && hsubr)
|
||||||
subst(str, hsubl, hsubr, gbal, hsubpatopt);
|
subst(str, dupstring(hsubl), dupstring(hsubr),
|
||||||
|
gbal, hsubpatopt);
|
||||||
break;
|
break;
|
||||||
case 'q':
|
case 'q':
|
||||||
*str = quotestring(*str, QT_BACKSLASH);
|
*str = quotestring(*str, QT_BACKSLASH);
|
||||||
|
|
|
@ -561,12 +561,14 @@
|
||||||
foo=(one.c two.c three.c)
|
foo=(one.c two.c three.c)
|
||||||
print ${foo:s/#%(#b)t(*).c/T${match[1]}.X/}
|
print ${foo:s/#%(#b)t(*).c/T${match[1]}.X/}
|
||||||
print *(#q:s/#(#b)tmp(*e)/'scrunchy${match[1]}'/)
|
print *(#q:s/#(#b)tmp(*e)/'scrunchy${match[1]}'/)
|
||||||
|
print ${${:-"left[({})]over"}:fs/(\\{\\}|\\(\\)|\\[\\])//}
|
||||||
unsetopt histsubstpattern
|
unsetopt histsubstpattern
|
||||||
0:HIST_SUBST_PATTERN option
|
0:HIST_SUBST_PATTERN option
|
||||||
>TINGcd TINGfile1 TINGfile2 homedir
|
>TINGcd TINGfile1 TINGfile2 homedir
|
||||||
>THUMPcd THUMPfile1 THUMPfile2
|
>THUMPcd THUMPfile1 THUMPfile2
|
||||||
>one.c Two.X Three.X
|
>one.c Two.X Three.X
|
||||||
>homedir scrunchyfile1 scrunchyfile2 tmpcd
|
>homedir scrunchyfile1 scrunchyfile2 tmpcd
|
||||||
|
>leftover
|
||||||
|
|
||||||
setopt ignorebraces
|
setopt ignorebraces
|
||||||
echo X{a,b}Y
|
echo X{a,b}Y
|
||||||
|
|
Loading…
Reference in New Issue