To: vim_dev@googlegroups.com Subject: Patch 8.2.5138 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.5138 Problem: Various small issues. Solution: Various small improvments. Files: src/filepath.c, src/job.c, src/mark.c, src/move.c, src/popupwin.c, src/testdir/test_filetype.vim *** ../vim-8.2.5137/src/filepath.c 2022-06-11 10:43:16.569008231 +0100 --- src/filepath.c 2022-06-16 11:31:18.049096895 +0100 *************** *** 1314,1320 **** 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) { int i; --- 1314,1320 ---- 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) == OK) { int i; *************** *** 1395,1401 **** 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) for (i = 0; i < ga.ga_len; ++i) list_append_string(rettv->vval.v_list, ((char_u **)(ga.ga_data))[i], -1); --- 1395,1401 ---- 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) == OK) for (i = 0; i < ga.ga_len; ++i) list_append_string(rettv->vval.v_list, ((char_u **)(ga.ga_data))[i], -1); *** ../vim-8.2.5137/src/job.c 2022-06-16 11:42:05.596034918 +0100 --- src/job.c 2022-06-19 13:07:36.227785152 +0100 *************** *** 222,228 **** 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)); return FAIL; } if (buflist_findnr(opt->jo_io_buf[part]) == NULL) --- 222,229 ---- 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)); return FAIL; } if (buflist_findnr(opt->jo_io_buf[part]) == NULL) *** ../vim-8.2.5137/src/mark.c 2022-04-09 13:34:02.780412358 +0100 --- src/mark.c 2022-06-16 11:32:39.332932961 +0100 *************** *** 1484,1490 **** { buf_T *buf = NULL; ! if (rettv_list_alloc(rettv) != OK) return; if (in_vim9script() && check_for_opt_buffer_arg(argvars, 0) == FAIL) --- 1484,1490 ---- { buf_T *buf = NULL; ! if (rettv_list_alloc(rettv) == FAIL) return; if (in_vim9script() && check_for_opt_buffer_arg(argvars, 0) == FAIL) *** ../vim-8.2.5137/src/move.c 2022-06-16 11:42:05.596034918 +0100 --- src/move.c 2022-06-19 20:58:08.507263746 +0100 *************** *** 315,321 **** if (curwin->w_cursor.lnum < curwin->w_botline) { if (((long)curwin->w_cursor.lnum ! >= (long)curwin->w_botline - *so_ptr #ifdef FEAT_FOLDING || hasAnyFolding(curwin) #endif --- 315,321 ---- if (curwin->w_cursor.lnum < curwin->w_botline) { if (((long)curwin->w_cursor.lnum ! >= (long)curwin->w_botline - *so_ptr #ifdef FEAT_FOLDING || hasAnyFolding(curwin) #endif *************** *** 378,384 **** else #endif line_count = curwin->w_cursor.lnum - curwin->w_botline ! + 1 + *so_ptr; if (line_count <= curwin->w_height + 1) scroll_cursor_bot(scrolljump_value(), FALSE); else --- 378,384 ---- else #endif line_count = curwin->w_cursor.lnum - curwin->w_botline ! + 1 + *so_ptr; if (line_count <= curwin->w_height + 1) scroll_cursor_bot(scrolljump_value(), FALSE); else *************** *** 1986,1992 **** /* * Recompute topline to put the cursor at the bottom of the window. ! * Scroll at least "min_scroll" lines. * If "set_topbot" is TRUE, set topline and botline first (for "zb"). * This is messy stuff!!! */ --- 1986,1992 ---- /* * Recompute topline to put the cursor at the bottom of the window. ! * When scrolling scroll at least "min_scroll" lines. * If "set_topbot" is TRUE, set topline and botline first (for "zb"). * This is messy stuff!!! */ *** ../vim-8.2.5137/src/popupwin.c 2022-05-30 17:57:47.098595199 +0100 --- src/popupwin.c 2022-06-16 11:32:51.288909875 +0100 *************** *** 2983,2989 **** win_T *wp; tabpage_T *tp; ! if (rettv_list_alloc(rettv) != OK) return; FOR_ALL_POPUPWINS(wp) list_append_number(rettv->vval.v_list, wp->w_id); --- 2983,2989 ---- win_T *wp; tabpage_T *tp; ! if (rettv_list_alloc(rettv) == FAIL) return; FOR_ALL_POPUPWINS(wp) list_append_number(rettv->vval.v_list, wp->w_id); *** ../vim-8.2.5137/src/testdir/test_filetype.vim 2022-06-16 13:27:13.360882932 +0100 --- src/testdir/test_filetype.vim 2022-06-20 11:34:38.732176695 +0100 *************** *** 872,877 **** --- 872,878 ---- let ext = substitute(ext, '\(\l\)', '\u\1', '') endfor + " clean up filetype off endfunc *** ../vim-8.2.5137/src/version.c 2022-06-20 11:22:58.387360464 +0100 --- src/version.c 2022-06-20 11:33:56.392134857 +0100 *************** *** 736,737 **** --- 736,739 ---- { /* Add new patch number below this line */ + /**/ + 5138, /**/ -- CRONE: Who sent you? ARTHUR: The Knights Who Say GNU! CRONE: Aaaagh! (she looks around in rear) No! We have no licenses here. "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///