mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-17 07:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17095 from zeertzjq/vim-8.2.3227

Browse Source 
vim-patch:8.2.{3227,3280,4094}: global-local 'virtualedit'
This commit is contained in:
bfredl
2022-01-27 08:34:57 +01:00
committed by GitHub
parent 55ad48d939 6c22e5fd1a
commit d50dd12725
13 changed files with 231 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/edit.c
View File

@@ -913,7 +913,7 @@ static int insert_handle_key(InsertState *s)
ins_ctrl_o();
// don't move the cursor left when 'virtualedit' has "onemore".
if (ve_flags & VE_ONEMORE) {
if (get_ve_flags() & VE_ONEMORE) {
ins_at_eol = false;
s->nomove = true;
}
@@ -6909,8 +6909,7 @@ int oneright(void)
// move "l" bytes right, but don't end up on the NUL, unless 'virtualedit'
// contains "onemore".
if (ptr[l] == NUL
&& (ve_flags & VE_ONEMORE) == 0) {
if (ptr[l] == NUL && (get_ve_flags() & VE_ONEMORE) == 0) {
return FAIL;
}
curwin->w_cursor.col += l;
@@ -8032,7 +8031,7 @@ static bool ins_esc(long *count, int cmdchar, bool nomove)
&& !VIsual_active
))
&& !revins_on) {
if (curwin->w_cursor.coladd > 0 || ve_flags == VE_ALL) {
if (curwin->w_cursor.coladd > 0 || get_ve_flags() == VE_ALL) {
oneleft();
if (restart_edit != NUL) {
curwin->w_cursor.coladd++;