mirror of
git://git.code.sf.net/p/zsh/code
synced 2024-11-19 13:33:52 +01:00
compdescribe shouldn't use the sets after failed initialisation
This commit is contained in:
parent
8ffa3c17cf
commit
d3ceb5e0eb
@ -5,6 +5,9 @@
|
||||
|
||||
2000-07-27 Sven Wischnowsky <wischnow@zsh.org>
|
||||
|
||||
* 12400: Src/Zle/computil.c: compdescribe shouldn't use the sets
|
||||
after failed initialisation
|
||||
|
||||
* 12394: Completion/Core/_main_complete: don't hide possible
|
||||
completions if there is only one and at the same time messages are
|
||||
shown
|
||||
|
@ -115,6 +115,7 @@ cd_init(char *nam, char *sep, char **args, int disp)
|
||||
if (cd_parsed) {
|
||||
zsfree(cd_state.sep);
|
||||
freecdsets(cd_state.sets);
|
||||
cd_parsed = 0;
|
||||
}
|
||||
setp = &(cd_state.sets);
|
||||
cd_state.sep = ztrdup(sep);
|
||||
@ -153,6 +154,7 @@ cd_init(char *nam, char *sep, char **args, int disp)
|
||||
if ((*args = tmp))
|
||||
args++;
|
||||
}
|
||||
cd_parsed = 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -259,10 +261,8 @@ bin_compdescribe(char *nam, char **args, char *ops, int func)
|
||||
}
|
||||
switch (args[0][1]) {
|
||||
case 'i':
|
||||
cd_parsed = 1;
|
||||
return cd_init(nam, "", args + 1, 0);
|
||||
case 'I':
|
||||
cd_parsed = 1;
|
||||
return cd_init(nam, args[1], args + 2, 1);
|
||||
case 'g':
|
||||
if (cd_parsed) {
|
||||
|
Loading…
Reference in New Issue
Block a user