mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-17 15:01:40 +02:00
fix for bashautolist+automenu (10609)
This commit is contained in:
parent
f7a6aa096a
commit
0713dfcd1a
4 changed files with 1465 additions and 3188 deletions
|
@ -1,3 +1,8 @@
|
|||
2000-04-10 Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
|
||||
|
||||
* 10609: Src/Zle/compcore.c, Src/Zle/compresult.c, Src/Zle/zle_tricky.c:
|
||||
fix for bashautolist+automenu
|
||||
|
||||
2000-04-09 Bart Schaefer <schaefer@zsh.org>
|
||||
|
||||
* 10606: Fix thinko in 10598.
|
||||
|
|
|
@ -776,8 +776,9 @@ callcompfunc(char *s, char *fn)
|
|||
}
|
||||
}
|
||||
}
|
||||
startauto = (compinsert &&
|
||||
!strcmp(compinsert, "automenu-unambiguous"));
|
||||
startauto = ((compinsert &&
|
||||
!strcmp(compinsert, "automenu-unambiguous")) ||
|
||||
(bashlistfirst && (!compinsert || !*compinsert)));
|
||||
useexact = (compexact && !strcmp(compexact, "accept"));
|
||||
|
||||
if (!comptoend || !*comptoend)
|
||||
|
|
|
@ -665,7 +665,9 @@ do_ambiguous(void)
|
|||
* prefix was inserted, return now, bypassing the list-displaying *
|
||||
* code. On the way, invalidate the list and note that we don't *
|
||||
* want to enter an AUTO_MENU imediately. */
|
||||
if (uselist == 3 && la) {
|
||||
if ((uselist == 3 ||
|
||||
(!uselist && isset(BASHAUTOLIST) && isset(LISTAMBIGUOUS))) &&
|
||||
la) {
|
||||
int fc = fromcomp;
|
||||
|
||||
invalidatelist();
|
||||
|
|
4639
Src/Zle/zle_tricky.c
4639
Src/Zle/zle_tricky.c
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue