diff options
| author | bfredl <bjorn.linse@gmail.com> | 2022-01-27 08:34:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-27 08:34:57 +0100 |
| commit | d50dd1272550346164b05cfc82b3a0aea6dd6b84 (patch) | |
| tree | 6612fbc107618b04ea830b076f9510f5111a030d /src/nvim/normal.c | |
| parent | 55ad48d93955462905622a42a460ffccd99aa77a (diff) | |
| parent | 6c22e5fd1a4e6d945bb76a4a8a558613f99ec793 (diff) | |
| download | rneovim-d50dd1272550346164b05cfc82b3a0aea6dd6b84.tar.gz rneovim-d50dd1272550346164b05cfc82b3a0aea6dd6b84.tar.bz2 rneovim-d50dd1272550346164b05cfc82b3a0aea6dd6b84.zip | |
Merge pull request #17095 from zeertzjq/vim-8.2.3227
vim-patch:8.2.{3227,3280,4094}: global-local 'virtualedit'
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 63311160a7..8f1751d483 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -6048,7 +6048,7 @@ static void n_start_visual_mode(int c) // Corner case: the 0 position in a tab may change when going into // virtualedit. Recalculate curwin->w_cursor to avoid bad highlighting. // - if (c == Ctrl_V && (ve_flags & VE_BLOCK) && gchar_cursor() == TAB) { + if (c == Ctrl_V && (get_ve_flags() & VE_BLOCK) && gchar_cursor() == TAB) { validate_virtcol(); coladvance(curwin->w_virtcol); } @@ -6953,7 +6953,7 @@ static void adjust_cursor(oparg_T *oap) if (curwin->w_cursor.col > 0 && gchar_cursor() == NUL && (!VIsual_active || *p_sel == 'o') && !virtual_active() - && (ve_flags & VE_ONEMORE) == 0) { + && (get_ve_flags() & VE_ONEMORE) == 0) { curwin->w_cursor.col--; // prevent cursor from moving on the trail byte mb_adjust_cursor(); @@ -7159,7 +7159,7 @@ static void nv_esc(cmdarg_T *cap) void set_cursor_for_append_to_line(void) { curwin->w_set_curswant = true; - if (ve_flags == VE_ALL) { + if (get_ve_flags() == VE_ALL) { const int save_State = State; // Pretend Insert mode here to allow the cursor on the |