mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-16 16:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0736: OptionSet not triggered when entering diff mode

Browse Source 
Problem:    The OptionSet autocommand event is not triggered when entering
            diff mode.
Solution:   use set_option_value() instead of setting the option directly.
            Change the tests from old to new style. (Christian Brabandt)

04f62f881c
This commit is contained in:
Justin M. Keyes
2018-02-02 01:51:56 +01:00
parent ce92e784e1
commit 61f9a7b0d0
3 changed files with 220 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/diff.c
View File

@@ -1058,6 +1058,20 @@ void ex_diffthis(exarg_T *eap)
diff_win_options(curwin, TRUE);
}
static void set_diff_option(win_T *wp, int value)
{
win_T *old_curwin = curwin;
curwin = wp;
curbuf = curwin->w_buffer;
curbuf_lock++;
set_option_value("diff", (long)value, NULL, OPT_LOCAL);
curbuf_lock--;
curwin = old_curwin;
curbuf = curwin->w_buffer;
}
/// Set options in window "wp" for diff mode.
///
/// @param addbuf Add buffer to diff.
@@ -1115,10 +1129,10 @@ void diff_win_options(win_T *wp, int addbuf)
do_cmdline_cmd("set sbo+=hor");
}
// Saved the current values, to be restored in ex_diffoff().
wp->w_p_diff_saved = TRUE;
// Save the current values, to be restored in ex_diffoff().
wp->w_p_diff_saved = true;
wp->w_p_diff = true;
set_diff_option(wp, true);
if (addbuf) {
diff_buf_add(wp->w_buffer);
@@ -1139,7 +1153,7 @@ void ex_diffoff(exarg_T *eap)
// Set 'diff' off. If option values were saved in
// diff_win_options(), restore the ones whose settings seem to have
// been left over from diff mode.
wp->w_p_diff = false;
set_diff_option(wp, false);
if (wp->w_p_diff_saved) {
if (wp->w_p_scb) {