Mercurial > vim
changeset 29239:da56650de132 v8.2.5138
patch 8.2.5138: various small issues
Commit: https://github.com/vim/vim/commit/8088ae95bbed2085c5fb196850c4e4b8df55c989
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jun 20 11:38:17 2022 +0100
patch 8.2.5138: various small issues
Problem: Various small issues.
Solution: Various small improvments.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 20 Jun 2022 12:45:03 +0200 |
| parents | ee6d7b2b9704 |
| children | 181099d99271 |
| files | src/filepath.c src/job.c src/mark.c src/move.c src/popupwin.c src/version.c |
| diffstat | 6 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/filepath.c +++ b/src/filepath.c @@ -1314,7 +1314,7 @@ f_glob(typval_T *argvars, typval_T *rett if (rettv->v_type == VAR_STRING) rettv->vval.v_string = ExpandOne(&xpc, tv_get_string(&argvars[0]), NULL, options, WILD_ALL); - else if (rettv_list_alloc(rettv) != FAIL) + else if (rettv_list_alloc(rettv) == OK) { int i; @@ -1395,7 +1395,7 @@ f_globpath(typval_T *argvars, typval_T * globpath(tv_get_string(&argvars[0]), file, &ga, flags); if (rettv->v_type == VAR_STRING) 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) list_append_string(rettv->vval.v_list, ((char_u **)(ga.ga_data))[i], -1);
--- a/src/job.c +++ b/src/job.c @@ -222,7 +222,8 @@ get_job_options(typval_T *tv, jobopt_T * opt->jo_io_buf[part] = tv_get_number(item); 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; } if (buflist_findnr(opt->jo_io_buf[part]) == NULL)
--- a/src/mark.c +++ b/src/mark.c @@ -1484,7 +1484,7 @@ f_getmarklist(typval_T *argvars, typval_ { buf_T *buf = NULL; - if (rettv_list_alloc(rettv) != OK) + if (rettv_list_alloc(rettv) == FAIL) return; if (in_vim9script() && check_for_opt_buffer_arg(argvars, 0) == FAIL)
--- a/src/move.c +++ b/src/move.c @@ -315,7 +315,7 @@ update_topline(void) if (curwin->w_cursor.lnum < curwin->w_botline) { if (((long)curwin->w_cursor.lnum - >= (long)curwin->w_botline - *so_ptr + >= (long)curwin->w_botline - *so_ptr #ifdef FEAT_FOLDING || hasAnyFolding(curwin) #endif @@ -378,7 +378,7 @@ update_topline(void) else #endif line_count = curwin->w_cursor.lnum - curwin->w_botline - + 1 + *so_ptr; + + 1 + *so_ptr; if (line_count <= curwin->w_height + 1) scroll_cursor_bot(scrolljump_value(), FALSE); 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. - * 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"). * This is messy stuff!!! */