diff options
| author | Oliver Kiddle <opk@zsh.org> | 2014-11-05 22:50:48 +0100 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2014-11-05 22:50:48 +0100 |
| commit | c7ff843ecf60ab74ce98929e45029b1aef5014e1 (patch) | |
| tree | a8fdeed6b399dd36c055e7030ccad10df1b1528a /Src/Zle/zle_vi.c | |
| parent | 4b66ec003ff0631e39240576920dda971d555f6d (diff) | |
| download | zsh-c7ff843ecf60ab74ce98929e45029b1aef5014e1.tar.gz zsh-c7ff843ecf60ab74ce98929e45029b1aef5014e1.tar.xz zsh-c7ff843ecf60ab74ce98929e45029b1aef5014e1.zip | |
33604: fix change merging for vi mode where a change has just been undone
Diffstat (limited to 'Src/Zle/zle_vi.c')
| -rw-r--r-- | Src/Zle/zle_vi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Src/Zle/zle_vi.c b/Src/Zle/zle_vi.c index 18c76f917..d74b40d62 100644 --- a/Src/Zle/zle_vi.c +++ b/Src/Zle/zle_vi.c @@ -109,7 +109,7 @@ startvitext(int im) { startvichange(im); selectkeymap("main", 1); - vistartchange = (curchange && curchange->prev) ? curchange->prev->changeno : 0; + vistartchange = undo_changeno; viinsbegin = zlecs; } @@ -403,7 +403,7 @@ vichange(UNUSED(char **args)) forekill(c2 - zlecs, CUT_RAW); selectkeymap("main", 1); viinsbegin = zlecs; - vistartchange = (curchange && curchange->prev) ? curchange->prev->changeno : 0; + vistartchange = undo_changeno; } return ret; } |