From f4a1d1c0542df151bc59ac3b798ed198b5c71ccc Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 16 Nov 2019 13:50:25 +0100 Subject: patch 8.1.2302: :lockmarks does not work for '[ and '] Problem: :lockmarks does not work for '[ and ']. Solution: save and restore '[ and '] marks. (James McCoy, closes #5222) --- src/bufwrite.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/bufwrite.c') diff --git a/src/bufwrite.c b/src/bufwrite.c index 13091a336e..8393df1a0c 100644 --- a/src/bufwrite.c +++ b/src/bufwrite.c @@ -683,6 +683,8 @@ buf_write( context_sha256_T sha_ctx; #endif unsigned int bkc = get_bkc_value(buf); + pos_T orig_start = buf->b_op_start; + pos_T orig_end = buf->b_op_end; if (fname == NULL || *fname == NUL) // safety check return FAIL; @@ -875,6 +877,13 @@ buf_write( #endif ) { + if (buf != NULL && cmdmod.lockmarks) + { + // restore the original '[ and '] positions + buf->b_op_start = orig_start; + buf->b_op_end = orig_end; + } + --no_wait_return; msg_scroll = msg_save; if (nofile_err) @@ -952,6 +961,13 @@ buf_write( fname = buf->b_sfname; } + if (cmdmod.lockmarks) + { + // restore the original '[ and '] positions + buf->b_op_start = orig_start; + buf->b_op_end = orig_end; + } + #ifdef FEAT_NETBEANS_INTG if (netbeans_active() && isNetbeansBuffer(buf)) { -- cgit v1.2.3