diff options
| author | Thomas Vigouroux <tomvig38@gmail.com> | 2020-09-23 22:45:51 +0200 |
|---|---|---|
| committer | Thomas Vigouroux <tomvig38@gmail.com> | 2021-07-06 19:08:32 +0200 |
| commit | 763c852812c8c7e819881a76a237b6f19920f803 (patch) | |
| tree | a2892e9cf4e89e5f58ed4870bf40af3f816f33f7 /src/nvim/diff.c | |
| parent | 55a2c513aafb386c01259fca711b2e0f9b85e359 (diff) | |
| download | rneovim-763c852812c8c7e819881a76a237b6f19920f803.tar.gz rneovim-763c852812c8c7e819881a76a237b6f19920f803.tar.bz2 rneovim-763c852812c8c7e819881a76a237b6f19920f803.zip | |
undo: reduce reliance on curbuf
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 53cb14bcc7..d462cea9dd 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -1334,9 +1334,9 @@ static void set_diff_option(win_T *wp, int value) curwin = wp; curbuf = curwin->w_buffer; - curbuf_lock++; + curbuf->b_ro_locked++; set_option_value("diff", (long)value, NULL, OPT_LOCAL); - curbuf_lock--; + curbuf->b_ro_locked--; curwin = old_curwin; curbuf = curwin->w_buffer; } @@ -2603,7 +2603,7 @@ void ex_diffgetput(exarg_T *eap) // FileChangedRO autocommand, which may do nasty things and mess // everything up. if (!curbuf->b_changed) { - change_warning(0); + change_warning(curbuf, 0); if (diff_buf_idx(curbuf) != idx_to) { EMSG(_("E787: Buffer changed unexpectedly")); goto theend; |