diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-02-07 18:28:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 18:28:34 -0500 |
| commit | 02a3c417945e7b7fc781906a78acbf88bd44c971 (patch) | |
| tree | 16f255fcf66a50ceea661e08cbea7ce965c46e7c /src/nvim/screen.c | |
| parent | a7d9df996dc1c353574845563216dc0372dd8b77 (diff) | |
| parent | d34846af7455b8411476700920cdb64f121bae69 (diff) | |
| download | rneovim-02a3c417945e7b7fc781906a78acbf88bd44c971.tar.gz rneovim-02a3c417945e7b7fc781906a78acbf88bd44c971.tar.bz2 rneovim-02a3c417945e7b7fc781906a78acbf88bd44c971.zip | |
Merge pull request #13898 from janlazo/set_string_option_direct
Refactor option,var functions to use char for param type
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index a78f905a70..6b6c51d836 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -5092,9 +5092,9 @@ static void redraw_custom_statusline(win_T *wp) // When there is an error disable the statusline, otherwise the // display is messed up with errors and a redraw triggers the problem // again and again. - set_string_option_direct((char_u *)"statusline", -1, - (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL - ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); + set_string_option_direct("statusline", -1, (char_u *)"", + OPT_FREE | (*wp->w_p_stl != NUL + ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); } did_emsg |= saved_did_emsg; entered = false; @@ -5175,7 +5175,7 @@ get_keymap_str ( static void win_redr_custom ( win_T *wp, - int draw_ruler /* TRUE or FALSE */ + bool draw_ruler ) { static int entered = FALSE; @@ -6852,7 +6852,7 @@ void draw_tabline(void) did_emsg = false; win_redr_custom(NULL, false); if (did_emsg) { - set_string_option_direct((char_u *)"tabline", -1, + set_string_option_direct("tabline", -1, (char_u *)"", OPT_FREE, SID_ERROR); } did_emsg |= saved_did_emsg; @@ -7114,11 +7114,12 @@ static void win_redr_ruler(win_T *wp, int always) if (*p_ruf) { int save_called_emsg = called_emsg; - called_emsg = FALSE; - win_redr_custom(wp, TRUE); - if (called_emsg) - set_string_option_direct((char_u *)"rulerformat", -1, - (char_u *)"", OPT_FREE, SID_ERROR); + called_emsg = false; + win_redr_custom(wp, true); + if (called_emsg) { + set_string_option_direct("rulerformat", -1, (char_u *)"", + OPT_FREE, SID_ERROR); + } called_emsg |= save_called_emsg; return; } |