thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0040: use of set_chars_option() is confusing

Browse Source 
Problem:    Use of set_chars_option() is confusing.
Solution:   Add "apply" argument to store the result or not.  Merge similar
            code.
This commit is contained in:
Bram Moolenaar
2022-07-04 21:03:36 +01:00
parent 4c99e622dd
commit b67f0c8e49
6 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/option.c
View File

@@ -2433,10 +2433,10 @@ didset_options2(void)
check_opt_wim();
// Parse default for 'listchars'.
(void)set_chars_option(curwin, &curwin->w_p_lcs);
(void)set_chars_option(curwin, &curwin->w_p_lcs, TRUE);
// Parse default for 'fillchars'.
(void)set_chars_option(curwin, &curwin->w_p_fcs);
(void)set_chars_option(curwin, &curwin->w_p_fcs, TRUE);
#ifdef FEAT_CLIPBOARD
// Parse default for 'clipboard'
@@ -5204,12 +5204,12 @@ unset_global_local_option(char_u *name, void *from)
break;
case PV_LCS:
clear_string_option(&((win_T *)from)->w_p_lcs);
set_chars_option((win_T *)from, &((win_T *)from)->w_p_lcs);
set_chars_option((win_T *)from, &((win_T *)from)->w_p_lcs, TRUE);
redraw_later(NOT_VALID);
break;
case PV_FCS:
clear_string_option(&((win_T *)from)->w_p_fcs);
set_chars_option((win_T *)from, &((win_T *)from)->w_p_fcs);
set_chars_option((win_T *)from, &((win_T *)from)->w_p_fcs, TRUE);
redraw_later(NOT_VALID);
break;
case PV_VE:
@@ -5607,8 +5607,8 @@ after_copy_winopt(win_T *wp)
fill_culopt_flags(NULL, wp);
check_colorcolumn(wp);
#endif
set_chars_option(wp, &wp->w_p_lcs);
set_chars_option(wp, &wp->w_p_fcs);
set_chars_option(wp, &wp->w_p_lcs, TRUE);
set_chars_option(wp, &wp->w_p_fcs, TRUE);
}
static char_u *