refactor: cast to int earlier when using 'so' and 'siso' (#24756)

This commit is contained in:
zeertzjq
2023-08-17 20:35:51 +08:00
committed by GitHub
parent 4292575dfc
commit 5a564bf242
6 changed files with 23 additions and 25 deletions

View File

@@ -6117,20 +6117,20 @@ dict_T *get_winbuf_options(const int bufopt)
/// Return the effective 'scrolloff' value for the current window, using the
/// global value when appropriate.
linenr_T get_scrolloff_value(win_T *wp)
int get_scrolloff_value(win_T *wp)
{
// Disallow scrolloff in terminal-mode. #11915
if (State & MODE_TERMINAL) {
return 0;
}
return wp->w_p_so < 0 ? (linenr_T)p_so : (linenr_T)wp->w_p_so;
return (int)(wp->w_p_so < 0 ? p_so : wp->w_p_so);
}
/// Return the effective 'sidescrolloff' value for the current window, using the
/// global value when appropriate.
long get_sidescrolloff_value(win_T *wp)
int get_sidescrolloff_value(win_T *wp)
{
return wp->w_p_siso < 0 ? p_siso : wp->w_p_siso;
return (int)(wp->w_p_siso < 0 ? p_siso : wp->w_p_siso);
}
Dictionary get_vimoption(String name, int scope, buf_T *buf, win_T *win, Error *err)