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

patch 8.2.5138: various small issues

Browse Source 
Problem:    Various small issues.
Solution:   Various small improvments.
This commit is contained in:
Bram Moolenaar 2022-06-20 11:38:17 +01:00
parent 509ce03831
commit 8088ae95bb
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/filepath.c
View File

@ -1314,7 +1314,7 @@ f_glob(typval_T *argvars, typval_T *rettv)
if (rettv->v_type == VAR_STRING) if (rettv->v_type == VAR_STRING)
rettv->vval.v_string = ExpandOne(&xpc, tv_get_string(&argvars[0]), rettv->vval.v_string = ExpandOne(&xpc, tv_get_string(&argvars[0]),
NULL, options, WILD_ALL); NULL, options, WILD_ALL);
else if (rettv_list_alloc(rettv) != FAIL) else if (rettv_list_alloc(rettv) == OK)
{ {
int i; int i;
@ -1395,7 +1395,7 @@ f_globpath(typval_T *argvars, typval_T *rettv)
globpath(tv_get_string(&argvars[0]), file, &ga, flags); globpath(tv_get_string(&argvars[0]), file, &ga, flags);
if (rettv->v_type == VAR_STRING) if (rettv->v_type == VAR_STRING)
rettv->vval.v_string = ga_concat_strings(&ga, "\n"); rettv->vval.v_string = ga_concat_strings(&ga, "\n");
else if (rettv_list_alloc(rettv) != FAIL) else if (rettv_list_alloc(rettv) == OK)
for (i = 0; i < ga.ga_len; ++i) for (i = 0; i < ga.ga_len; ++i)
list_append_string(rettv->vval.v_list, list_append_string(rettv->vval.v_list,
((char_u **)(ga.ga_data))[i], -1); ((char_u **)(ga.ga_data))[i], -1);

3
src/job.c
View File

@ -222,7 +222,8 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
opt->jo_io_buf[part] = tv_get_number(item); opt->jo_io_buf[part] = tv_get_number(item);
if (opt->jo_io_buf[part] <= 0) if (opt->jo_io_buf[part] <= 0)
{ {
semsg(_(e_invalid_value_for_argument_str_str), hi->hi_key, tv_get_string(item)); semsg(_(e_invalid_value_for_argument_str_str),
hi->hi_key, tv_get_string(item));
return FAIL; return FAIL;
} }
if (buflist_findnr(opt->jo_io_buf[part]) == NULL) if (buflist_findnr(opt->jo_io_buf[part]) == NULL)

2
src/mark.c
View File

@ -1484,7 +1484,7 @@ f_getmarklist(typval_T *argvars, typval_T *rettv)
{ {
buf_T *buf = NULL; buf_T *buf = NULL;
if (rettv_list_alloc(rettv) != OK) if (rettv_list_alloc(rettv) == FAIL)
return; return;
if (in_vim9script() && check_for_opt_buffer_arg(argvars, 0) == FAIL) if (in_vim9script() && check_for_opt_buffer_arg(argvars, 0) == FAIL)

6
src/move.c
View File

@ -315,7 +315,7 @@ update_topline(void)
if (curwin->w_cursor.lnum < curwin->w_botline) if (curwin->w_cursor.lnum < curwin->w_botline)
{ {
if (((long)curwin->w_cursor.lnum if (((long)curwin->w_cursor.lnum
>= (long)curwin->w_botline - *so_ptr >= (long)curwin->w_botline - *so_ptr
#ifdef FEAT_FOLDING #ifdef FEAT_FOLDING
|| hasAnyFolding(curwin) || hasAnyFolding(curwin)
#endif #endif
@ -378,7 +378,7 @@ update_topline(void)
else else
#endif #endif
line_count = curwin->w_cursor.lnum - curwin->w_botline line_count = curwin->w_cursor.lnum - curwin->w_botline
+ 1 + *so_ptr; + 1 + *so_ptr;
if (line_count <= curwin->w_height + 1) if (line_count <= curwin->w_height + 1)
scroll_cursor_bot(scrolljump_value(), FALSE); scroll_cursor_bot(scrolljump_value(), FALSE);
else else
@ -1986,7 +1986,7 @@ set_empty_rows(win_T *wp, int used)
/* /*
* Recompute topline to put the cursor at the bottom of the window. * Recompute topline to put the cursor at the bottom of the window.
* Scroll at least "min_scroll" lines. * When scrolling scroll at least "min_scroll" lines.
* If "set_topbot" is TRUE, set topline and botline first (for "zb"). * If "set_topbot" is TRUE, set topline and botline first (for "zb").
* This is messy stuff!!! * This is messy stuff!!!
*/ */

2
src/popupwin.c
View File

@ -2983,7 +2983,7 @@ f_popup_list(typval_T *argvars UNUSED, typval_T *rettv)
win_T *wp; win_T *wp;
tabpage_T *tp; tabpage_T *tp;
if (rettv_list_alloc(rettv) != OK) if (rettv_list_alloc(rettv) == FAIL)
return; return;
FOR_ALL_POPUPWINS(wp) FOR_ALL_POPUPWINS(wp)
list_append_number(rettv->vval.v_list, wp->w_id); list_append_number(rettv->vval.v_list, wp->w_id);

2
src/version.c
View File

@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
5138,
/**/ /**/
5137, 5137,
/**/ /**/