diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-06-20 11:38:17 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-20 11:38:17 +0100 |
| commit | 8088ae95bbed2085c5fb196850c4e4b8df55c989 (patch) | |
| tree | c1507cdeb643ca125e72d4a1158c2b7ac018c6fa | |
| parent | 509ce0383105d5b516ef2d489adb7c554d3c8f81 (diff) | |
| download | vim-git-8.2.5138.tar.gz | |
patch 8.2.5138: various small issuesv8.2.5138
Problem: Various small issues.
Solution: Various small improvments.
| -rw-r--r-- | src/filepath.c | 4 | ||||
| -rw-r--r-- | src/job.c | 3 | ||||
| -rw-r--r-- | src/mark.c | 2 | ||||
| -rw-r--r-- | src/move.c | 6 | ||||
| -rw-r--r-- | src/popupwin.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
6 files changed, 11 insertions, 8 deletions
diff --git a/src/filepath.c b/src/filepath.c index 654d03aab..854d823c9 100644 --- a/src/filepath.c +++ b/src/filepath.c @@ -1314,7 +1314,7 @@ f_glob(typval_T *argvars, typval_T *rettv) 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 *rettv) 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); @@ -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); 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) diff --git a/src/mark.c b/src/mark.c index e7addbea8..ade5a1087 100644 --- a/src/mark.c +++ b/src/mark.c @@ -1484,7 +1484,7 @@ f_getmarklist(typval_T *argvars, typval_T *rettv) { 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) diff --git a/src/move.c b/src/move.c index 5865af8a5..c2e271203 100644 --- 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!!! */ diff --git a/src/popupwin.c b/src/popupwin.c index bb889d556..dd8770550 100644 --- a/src/popupwin.c +++ b/src/popupwin.c @@ -2983,7 +2983,7 @@ f_popup_list(typval_T *argvars UNUSED, typval_T *rettv) win_T *wp; tabpage_T *tp; - if (rettv_list_alloc(rettv) != OK) + if (rettv_list_alloc(rettv) == FAIL) return; FOR_ALL_POPUPWINS(wp) list_append_number(rettv->vval.v_list, wp->w_id); diff --git a/src/version.c b/src/version.c index 584d9e1b1..042278738 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5138, +/**/ 5137, /**/ 5136, |