diff options
| author | Josh Rahm <rahm@google.com> | 2022-08-22 15:52:25 -0600 |
|---|---|---|
| committer | Josh Rahm <rahm@google.com> | 2022-08-22 15:52:25 -0600 |
| commit | 24c75e4f7be4eb4052939e7d5db7721d88288604 (patch) | |
| tree | 55e6e0c8e5f45e7ac007f33f025f98ad2921af36 /src/nvim/diff.c | |
| parent | bf37d6bbd02d79fd86dc7740f0c27ebb1b5f5903 (diff) | |
| parent | baaaa1f2b3b6ae3a989d1362a27e55dc7b0b148a (diff) | |
| download | rneovim-24c75e4f7be4eb4052939e7d5db7721d88288604.tar.gz rneovim-24c75e4f7be4eb4052939e7d5db7721d88288604.tar.bz2 rneovim-24c75e4f7be4eb4052939e7d5db7721d88288604.zip | |
Merge remote-tracking branch 'upstream/master' into userreg
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 5485d528f7..bfafc3b4e0 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -1374,7 +1374,7 @@ static void set_diff_option(win_T *wp, int value) curwin = wp; curbuf = curwin->w_buffer; curbuf->b_ro_locked++; - set_option_value("diff", (long)value, NULL, OPT_LOCAL); + set_option_value_give_err("diff", (long)value, NULL, OPT_LOCAL); curbuf->b_ro_locked--; curwin = old_curwin; curbuf = curwin->w_buffer; |