diff options
author | Andrey Borzenkov <bor@users.sourceforge.net> | 2009-01-09 20:54:35 +0000 |
---|---|---|
committer | Andrey Borzenkov <bor@users.sourceforge.net> | 2009-01-09 20:54:35 +0000 |
commit | 1a43616975310a638f76ba4f5e73757e4b071a1f (patch) | |
tree | 6f9fb10b571018ab8e3ba3d3af5286a18c2f098d /Src/Zle/compresult.c | |
parent | 369a03d09f1661ea92509dde0e1c45fcc9620adb (diff) | |
download | zsh-1a43616975310a638f76ba4f5e73757e4b071a1f.tar.gz zsh-1a43616975310a638f76ba4f5e73757e4b071a1f.tar.xz zsh-1a43616975310a638f76ba4f5e73757e4b071a1f.zip |
26270: allow accept-and-menu-complete work with _vallues as well
Diffstat (limited to 'Src/Zle/compresult.c')
-rw-r--r-- | Src/Zle/compresult.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c index e595802dd..630c7634c 100644 --- a/Src/Zle/compresult.c +++ b/Src/Zle/compresult.c @@ -1309,21 +1309,23 @@ accept_last(void) lastbrbeg->str[l] = ','; lastbrbeg->str[l + 1] = '\0'; } else { - int l; - zlemetacs = minfo.pos + minfo.len + minfo.insc; - iremovesuffix(' ', 1); - l = zlemetacs; - zlemetacs = minfo.pos + minfo.len + minfo.insc - (*(minfo.cur))->qisl; - if (zlemetacs < l) - foredel(l - zlemetacs, CUT_RAW); - else if (zlemetacs > zlemetall) - zlemetacs = zlemetall; - inststrlen(" ", 1, 1); + if (!complistinword) { + int l; + + iremovesuffix(' ', 1); + l = zlemetacs; + zlemetacs = minfo.pos + minfo.len + minfo.insc - (*(minfo.cur))->qisl; + if (zlemetacs < l) + foredel(l - zlemetacs, CUT_RAW); + else if (zlemetacs > zlemetall) + zlemetacs = zlemetall; + inststrlen(" ", 1, 1); + } minfo.insc = minfo.len = 0; minfo.pos = zlemetacs; minfo.we = 1; - } + } if (!wasmeta) unmetafy_line(); |