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:
Jan Edmund Lazo
2018-09-11 19:08:35 -04:00
parent 61df24b998
commit a021b30ede
2 changed files with 25 additions and 4 deletions

View File

@@ -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;