aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/diff.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-08-22 13:56:50 +0800
committerGitHub <noreply@github.com>2022-08-22 13:56:50 +0800
commit2bed0d1d978b42184564201088ea5fef12ec8581 (patch)
treea6ad160916e751a71a39c44303bdf1a7e2616a31 /src/nvim/diff.c
parentd4d27c41b3298c25ae62bc067472bef37bc61c99 (diff)
downloadrneovim-2bed0d1d978b42184564201088ea5fef12ec8581.tar.gz
rneovim-2bed0d1d978b42184564201088ea5fef12ec8581.tar.bz2
rneovim-2bed0d1d978b42184564201088ea5fef12ec8581.zip
vim-patch:8.2.4753: error from setting an option is silently ignored (#19888)
Problem: Error from setting an option is silently ignored. Solution: Handle option value errors better. Fix uses of N_(). https://github.com/vim/vim/commit/31e5c60a682840959cae6273ccadd9aae48c928d
Diffstat (limited to 'src/nvim/diff.c')
-rw-r--r--src/nvim/diff.c2
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;