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

fix for bashautolist+automenu (10609)

Browse source
This commit is contained in:
Sven Wischnowsky 2000-04-10 08:06:38 +00:00
parent f7a6aa096a
commit 0713dfcd1a
4 changed files with 1465 additions and 3188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2000-04-09 Bart Schaefer <schaefer@zsh.org>
* 10606: Fix thinko in 10598. * 10606: Fix thinko in 10598.

5
Src/Zle/compcore.c
View file

@ -776,8 +776,9 @@ callcompfunc(char *s, char *fn)
} }
} }
} }
startauto = (compinsert && startauto = ((compinsert &&
!strcmp(compinsert, "automenu-unambiguous")); !strcmp(compinsert, "automenu-unambiguous")) ||
(bashlistfirst && (!compinsert || !*compinsert)));
useexact = (compexact && !strcmp(compexact, "accept")); useexact = (compexact && !strcmp(compexact, "accept"));
if (!comptoend || !*comptoend) if (!comptoend || !*comptoend)

4
Src/Zle/compresult.c
View file

@ -665,7 +665,9 @@ do_ambiguous(void)
* prefix was inserted, return now, bypassing the list-displaying * * prefix was inserted, return now, bypassing the list-displaying *
* code. On the way, invalidate the list and note that we don't * * code. On the way, invalidate the list and note that we don't *
* want to enter an AUTO_MENU imediately. */ * want to enter an AUTO_MENU imediately. */
if (uselist == 3 && la) { if ((uselist == 3 ||
(!uselist && isset(BASHAUTOLIST) && isset(LISTAMBIGUOUS))) &&
la) {
int fc = fromcomp; int fc = fromcomp;
invalidatelist(); invalidatelist();

4639
Src/Zle/zle_tricky.c
View file

File diff suppressed because it is too large Load diff