mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 14:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(mark): fix unexpected cursor movements (#19253)

Browse Source
This commit is contained in:
zeertzjq
2022-07-06 19:01:44 +08:00
committed by GitHub
parent c68f1d7263
commit 9ced054134
3 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/mark.c
View File

@@ -448,27 +448,21 @@ fmark_T *mark_get_local(buf_T *buf, win_T *win, int name)
fmark_T *mark_get_motion(buf_T *buf, win_T *win, int name)
{
fmark_T *mark = NULL;
if (name == '{' || name == '}') {
// to previous/next paragraph
const pos_T pos = curwin->w_cursor;
const bool slcb = listcmd_busy;
listcmd_busy = true; // avoid that '' is changed
if (name == '{' || name == '}') { // to previous/next paragraph
oparg_T oa;
bool slcb = listcmd_busy;
listcmd_busy = true; // avoid that '' is changed
if (findpar(&oa.inclusive,
name == '}' ? FORWARD : BACKWARD, 1L, NUL, false)) {
if (findpar(&oa.inclusive, name == '}' ? FORWARD : BACKWARD, 1L, NUL, false)) {
mark = pos_to_mark(buf, NULL, win->w_cursor);
}
listcmd_busy = slcb;
// to previous/next sentence
} else if (name == '(' || name == ')') {
bool slcb = listcmd_busy;
listcmd_busy = true; // avoid that '' is changed
} else if (name == '(' || name == ')') { // to previous/next sentence
if (findsent(name == ')' ? FORWARD : BACKWARD, 1L)) {
mark = pos_to_mark(buf, NULL, win->w_cursor);
}
listcmd_busy = slcb;
}
curwin->w_cursor = pos;
listcmd_busy = slcb;
return mark;
}