mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-28 17:10:59 +01:00
Code Releases Activity

33633: support vim style text objects

Browse source
This commit is contained in:
Oliver Kiddle 2014-11-17 00:44:26 +01:00
parent 15fc2cd4f0
commit 25cc978a99
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Src/Zle/zle_vi.c
View file

@ -161,12 +161,13 @@ vigetkey(void)
static int
getvirange(int wf)
{
int pos = zlecs, ret = 0;
int pos = zlecs, mpos = mark, ret = 0;
int mult1 = zmult, hist1 = histline;
Thingy k2;
virangeflag = 1;
wordflag = wf;
mark = -1;
/* use operator-pending keymap if one exists */
Keymap km = openkeymap("viopp");
if (km)
@ -191,6 +192,7 @@ getvirange(int wf)
k2 == Th(z_sendbreak)) {
wordflag = 0;
virangeflag = 0;
mark = mpos;
return -1;
}
/*
@ -214,13 +216,16 @@ getvirange(int wf)
histline = hist1;
ZS_memcpy(zleline, lastline, zlell = lastll);
zlecs = pos;
mark = mpos;
return -1;
}
/* Can't handle an empty file. Also, if the movement command *
* failed, or didn't move, it is an error. */
if (!zlell || (zlecs == pos && virangeflag != 2) || ret == -1)
if (!zlell || (zlecs == pos && mark == -1 && virangeflag != 2) || ret == -1) {
mark = mpos;
return -1;
}
/* vi-match-bracket changes the value of virangeflag when *
* moving to the opening bracket, meaning that we need to *
@ -230,6 +235,12 @@ getvirange(int wf)
virangeflag = 0;
selectlocalmap(NULL);
/* if the mark has moved, ignore the original cursor position *
* and use the mark. */
if (mark != -1)
pos = mark;
mark = mpos;
/* Get the range the right way round. zlecs is placed at the *
* start of the range, and pos (the return value of this *
* function) is the end. */