patch 8.2.5138: various small issues v8.2.5138
authorBram Moolenaar <Bram@vim.org>
Mon, 20 Jun 2022 10:38:17 +0000 (11:38 +0100)
committerBram Moolenaar <Bram@vim.org>
Mon, 20 Jun 2022 10:38:17 +0000 (11:38 +0100)
Problem:    Various small issues.
Solution:   Various small improvments.

src/filepath.c
src/job.c
src/mark.c
src/move.c
src/popupwin.c
src/version.c

index 654d03aab0553c52b50cd451d103dc4d05dd4828..854d823c9750d97aa5a2b228dde98a50342c155d 100644 (file)
@@ -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);
index 7dbfc7de9d32d1d6b84c0d4b63d5c1b22094b28b..259d49c3d080248f0a387c27fb481ff9f0c5a4f5 100644 (file)
--- a/src/job.c
+++ b/src/job.c
@@ -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)
index e7addbea8e0b55322bdcac409e945f4a78761cbf..ade5a1087b7df580c1300ded3b0a2fee82c05f3d 100644 (file)
@@ -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)
index 5865af8a5cf5daf00ca260bacab2cfecc7e35f94..c2e271203b705c1277f19fd941fcc2620d7110c5 100644 (file)
@@ -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!!!
  */
index bb889d556874b739683cb7404916914b9e98df0e..dd87705504b408f9ceb42aef951a4e69eba14e5a 100644 (file)
@@ -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);
index 584d9e1b197bdf96dc2a9e1b79e97d8b6152e65f..0422787384a165080134df7e3eff9a27421a6c06 100644 (file)
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5138,
 /**/
     5137,
 /**/