diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2009-01-13 12:19:53 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2009-01-13 12:19:53 +0000 |
| commit | 0cf040f4bf50c5530bd19da76ea234e2cd831667 (patch) | |
| tree | 3249b38bb7eed7adc09358d9f0f12b53c9870af8 /Src/Zle/compresult.c | |
| parent | e7c9e03c58f04a04c35a0e4c3721f939ba5e58c2 (diff) | |
| download | zsh-0cf040f4bf50c5530bd19da76ea234e2cd831667.tar.gz zsh-0cf040f4bf50c5530bd19da76ea234e2cd831667.tar.xz zsh-0cf040f4bf50c5530bd19da76ea234e2cd831667.zip | |
Back off 26270 (accept-and-menu-complete).
Was causing memory corruption
Diffstat (limited to 'Src/Zle/compresult.c')
| -rw-r--r-- | Src/Zle/compresult.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c index 630c7634c..e595802dd 100644 --- a/Src/Zle/compresult.c +++ b/Src/Zle/compresult.c @@ -1309,23 +1309,21 @@ accept_last(void) lastbrbeg->str[l] = ','; lastbrbeg->str[l + 1] = '\0'; } else { - zlemetacs = minfo.pos + minfo.len + minfo.insc; - if (!complistinword) { - int l; + 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); - } + 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); minfo.insc = minfo.len = 0; minfo.pos = zlemetacs; minfo.we = 1; - } + } if (!wasmeta) unmetafy_line(); |