mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 22:11:54 +02:00
Code Releases Activity

make sure wouldinstab is set before calling docomplete() (11503)

Browse source
This commit is contained in:
Sven Wischnowsky 2000-05-22 14:50:07 +00:00
parent bf40a2f40c
commit 01bd1c61ae
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -4,6 +4,9 @@
2000-05-22 Sven Wischnowsky <wischnow@zsh.org>
* 11503: Src/Zle/zle_tricky.c: make sure wouldinstab is set before
calling docomplete()
* 11500: Completion/Core/_main_complete: another fix for
`select=long*' in menu style

12
Src/Zle/zle_tricky.c
View file

@ -158,7 +158,6 @@ usetab(void)
{
unsigned char *s = line + cs - 1;
wouldinstab = 0;
if (keybuf[0] != '\t' || keybuf[1])
return 0;
for (; s >= line && *s != '\n'; s--)
@ -192,6 +191,7 @@ completeword(char **args)
{
usemenu = !!isset(MENUCOMPLETE);
useglob = isset(GLOBCOMPLETE);
wouldinstab = 0;
if (c == '\t' && usetab())
return selfinsert(args);
else {
@ -213,6 +213,7 @@ menucomplete(char **args)
{
usemenu = 1;
useglob = isset(GLOBCOMPLETE);
wouldinstab = 0;
if (c == '\t' && usetab())
return selfinsert(args);
else
@ -225,6 +226,7 @@ listchoices(char **args)
{
usemenu = !!isset(MENUCOMPLETE);
useglob = isset(GLOBCOMPLETE);
wouldinstab = 0;
return docomplete(COMP_LIST_COMPLETE);
}
@ -233,6 +235,7 @@ int
spellword(char **args)
{
usemenu = useglob = 0;
wouldinstab = 0;
return docomplete(COMP_SPELL);
}
@ -242,6 +245,7 @@ deletecharorlist(char **args)
{
usemenu = !!isset(MENUCOMPLETE);
useglob = isset(GLOBCOMPLETE);
wouldinstab = 0;
if (cs != ll) {
fixsuffix();
@ -256,6 +260,7 @@ int
expandword(char **args)
{
usemenu = useglob = 0;
wouldinstab = 0;
if (c == '\t' && usetab())
return selfinsert(args);
else
@ -268,6 +273,7 @@ expandorcomplete(char **args)
{
usemenu = !!isset(MENUCOMPLETE);
useglob = isset(GLOBCOMPLETE);
wouldinstab = 0;
if (c == '\t' && usetab())
return selfinsert(args);
else {
@ -289,6 +295,7 @@ menuexpandorcomplete(char **args)
{
usemenu = 1;
useglob = isset(GLOBCOMPLETE);
wouldinstab = 0;
if (c == '\t' && usetab())
return selfinsert(args);
else
@ -301,6 +308,7 @@ listexpand(char **args)
{
usemenu = !!isset(MENUCOMPLETE);
useglob = isset(GLOBCOMPLETE);
wouldinstab = 0;
return docomplete(COMP_LIST_EXPAND);
}
@ -308,6 +316,7 @@ listexpand(char **args)
mod_export int
reversemenucomplete(char **args)
{
wouldinstab = 0;
if (!menucmp)
return menucomplete(args);
@ -319,6 +328,7 @@ reversemenucomplete(char **args)
int
acceptandmenucomplete(char **args)
{
wouldinstab = 0;
if (!menucmp)
return 1;
runhookdef(ACCEPTCOMPHOOK, NULL);