From 1f5c734f5ef4327f65e28105f83351269a6259ca Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sat, 19 Nov 2016 06:23:56 +0000 Subject: 39981: Make compstate[to_end] skip suffix and hidden suffix, but not ignored suffix. Motivated by 39930. --- ChangeLog | 5 +++++ Src/Zle/compresult.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 31cfc5b07..49c58497a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-11-21 Daniel Shahaf + + * 39981: Src/Zle/compresult.c: Make compstate[to_end] skip + suffix and hidden suffix, but not ignored suffix. + 2016-11-20 Oliver Kiddle * 39986, 39989: Src/Zle/zle.h, Src/Zle/zle_keymap.c, diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c index b7ec18f6d..05799399d 100644 --- a/Src/Zle/compresult.c +++ b/Src/Zle/compresult.c @@ -1174,6 +1174,10 @@ do_single(Cmatch m) zlemetacs = minfo.end; if (zlemetacs + m->qisl == lastend) zlemetacs += minfo.insc; + + /* Advance CURSOR past compadd -s/-S suffixes. */ + zlemetacs += strlen(psuf); + zlemetacs += m->suf ? strlen(m->suf) : 0; } { Cmatch *om = minfo.cur; -- cgit 1.4.1