From 763c852812c8c7e819881a76a237b6f19920f803 Mon Sep 17 00:00:00 2001
From: Thomas Vigouroux <tomvig38@gmail.com>
Date: Wed, 23 Sep 2020 22:45:51 +0200
Subject: undo: reduce reliance on curbuf

---
 src/nvim/diff.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/nvim/diff.c')

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