mirror of
https://github.com/neovim/neovim.git
synced 2025-09-27 05:28:33 +00:00
vim-patch:8.1.0034: cursor not restored with ":edit #"
Problem: Cursor not restored with ":edit #".
Solution: Don't assume autocommands moved the cursor when it was moved to
the first non-blank.
adb8fbec4f
This commit is contained in:
@@ -2546,11 +2546,17 @@ int do_ecmd(
|
||||
}
|
||||
check_arg_idx(curwin);
|
||||
|
||||
// If autocommands change the cursor position or topline, we should keep
|
||||
// it. Also when it moves within a line.
|
||||
// If autocommands change the cursor position or topline, we should
|
||||
// keep it. Also when it moves within a line. But not when it moves
|
||||
// to the first non-blank.
|
||||
if (!equalpos(curwin->w_cursor, orig_pos)) {
|
||||
newlnum = curwin->w_cursor.lnum;
|
||||
newcol = curwin->w_cursor.col;
|
||||
const char_u *text = get_cursor_line_ptr();
|
||||
|
||||
if (curwin->w_cursor.lnum != orig_pos.lnum
|
||||
|| curwin->w_cursor.col != (int)(skipwhite(text) - text)) {
|
||||
newlnum = curwin->w_cursor.lnum;
|
||||
newcol = curwin->w_cursor.col;
|
||||
}
|
||||
}
|
||||
if (curwin->w_topline == topline)
|
||||
topline = 0;
|
||||
|
Reference in New Issue
Block a user