mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-03 10:21:46 +02:00
Code Releases Activity

allow completion after `a{{b,c},'; fix for closing brace re-insertion when completing from both ends (CLF_MID) (11939)

Browse source
This commit is contained in:
Sven Wischnowsky 2000-06-16 07:52:05 +00:00
parent ae2b3953df
commit 1416862b63
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2000-06-16 Sven Wischnowsky <wischnow@zsh.org>
* 11939: Src/Zle/compmatch.c, Src/Zle/compresult.c, Src/Zle/zle_tricky.c:
allow completion after `a{{b,c},'; fix for closing brace
re-insertion when completing from both ends (CLF_MID)
* 11938: Completion/Core/_description, Doc/Zsh/compsys.yo: enhance
ignore-line to ignore all/current/other word(s)

1
Src/Zle/compmatch.c
View file

@ -1608,6 +1608,7 @@ join_psfx(Cline ot, Cline nt, Cline *orest, Cline *nrest, int sfx)
continue;
}
o->llen = o->llen - ot->slen;
join = 1; line = 0; slen = &(o->wlen); sstr = &(o->word);
}
if (join) {

4
Src/Zle/compresult.c
View file

@ -406,8 +406,8 @@ cline_str(Cline l, int ins, int *csp)
* with missing characters, we take this, otherwise if we have a
* prefix with missing characters, we take that, the same for a
* suffix, and finally a place where the matches differ. */
ncs = (cbr >= 0 ? cbr :
(mid >= 0 ? mid :
ncs = (mid >= 0 ? mid :
(cbr >= 0 ? cbr :
(pm >= 0 ? pm : (sm >= 0 ? sm : (d >= 0 ? d : cs)))));
if (!ins) {

8
Src/Zle/zle_tricky.c
View file

@ -1434,10 +1434,6 @@ get_comp_string(void)
}
}
} else if (p < curs) {
if (*p == Outbrace) {
cant = 1;
break;
}
if (*p == Inbrace) {
if (bbeg) {
Brinfo new;
@ -1474,10 +1470,6 @@ get_comp_string(void)
hascom = 1;
}
} else {
if (*p == Inbrace) {
cant = 1;
break;
}
if (p == curs) {
if (bbeg) {
Brinfo new;