diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-06-14 21:57:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-14 21:57:08 +0800 |
| commit | 8ba64dd3ad1822efd6f986349e99f5f85afd7be7 (patch) | |
| tree | 66b2987707cf6616614fb251d7e342ccdfd96c28 /src/nvim/diff.c | |
| parent | 2a2fb8be74f9147773416be63334ea6a74c66869 (diff) | |
| parent | 0a0cda95286bf62fbce2776a0c0081cea39a88a8 (diff) | |
| download | rneovim-8ba64dd3ad1822efd6f986349e99f5f85afd7be7.tar.gz rneovim-8ba64dd3ad1822efd6f986349e99f5f85afd7be7.tar.bz2 rneovim-8ba64dd3ad1822efd6f986349e99f5f85afd7be7.zip | |
Merge pull request #18947 from zeertzjq/vim-8.2.1897
vim-patch:8.2.{1897,1898,5088}
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index a622100918..700e79ac75 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -790,14 +790,14 @@ static int diff_write(buf_T *buf, diffin_T *din) // Always use 'fileformat' set to "unix". char_u *save_ff = buf->b_p_ff; buf->b_p_ff = vim_strsave((char_u *)FF_UNIX); - const bool save_lockmarks = cmdmod.lockmarks; + const bool save_cmod_flags = cmdmod.cmod_flags; // Writing the buffer is an implementation detail of performing the diff, // so it shouldn't update the '[ and '] marks. - cmdmod.lockmarks = true; + cmdmod.cmod_flags |= CMOD_LOCKMARKS; int r = buf_write(buf, (char *)din->din_fname, NULL, (linenr_T)1, buf->b_ml.ml_line_count, NULL, false, false, false, true); - cmdmod.lockmarks = save_lockmarks; + cmdmod.cmod_flags = save_cmod_flags; free_string_option(buf->b_p_ff); buf->b_p_ff = save_ff; return r; @@ -1263,7 +1263,7 @@ void ex_diffpatch(exarg_T *eap) } // don't use a new tab page, each tab page has its own diffs - cmdmod.tab = 0; + cmdmod.cmod_tab = 0; if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) { // Pretend it was a ":split fname" command @@ -1323,7 +1323,7 @@ void ex_diffsplit(exarg_T *eap) set_fraction(curwin); // don't use a new tab page, each tab page has its own diffs - cmdmod.tab = 0; + cmdmod.cmod_tab = 0; if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) { // Pretend it was a ":split fname" command |