To: vim_dev@googlegroups.com Subject: Patch 8.2.2160 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2160 Problem: Various typos. Solution: Fix spelling mistakes. (closes #7494) Files: src/bufwrite.c, src/cindent.c, src/cmdexpand.c, src/eval.c, src/ex_cmds.c, src/feature.h, src/getchar.c, src/gui_haiku.cc, src/gui_xmdlg.c, src/help.c, src/if_ole.cpp, src/insexpand.c, src/list.c, src/map.c, src/memline.c, src/normal.c, src/os_win32.c, src/search.c, src/term.c, src/testdir/test_arglist.vim, src/testdir/test_autocmd.vim, src/testdir/test_debugger.vim, src/testdir/test_increment.vim, src/testdir/test_menu.vim, src/testdir/test_netbeans.vim, src/testdir/test_popupwin.vim, src/testdir/test_python2.vim, src/testdir/test_python3.vim, src/testdir/test_sort.vim, src/testdir/test_terminal2.vim, src/testdir/test_terminal3.vim, src/testdir/test_vartabs.vim, src/testdir/test_vimscript.vim, src/textprop.c, src/userfunc.c, src/vim9.h, src/vim9compile.c, src/vim9execute.c *** ../vim-8.2.2159/src/bufwrite.c 2020-11-23 22:01:22.642662389 +0100 --- src/bufwrite.c 2020-12-18 19:41:21.623585499 +0100 *************** *** 2138,2144 **** if (!checking_conversion) { #if defined(UNIX) && defined(HAVE_FSYNC) ! // On many journalling file systems there is a bug that causes both the // original and the backup file to be lost when halting the system // right after writing the file. That's because only the meta-data is // journalled. Syncing the file slows down the system, but assures it --- 2138,2144 ---- if (!checking_conversion) { #if defined(UNIX) && defined(HAVE_FSYNC) ! // On many journaling file systems there is a bug that causes both the // original and the backup file to be lost when halting the system // right after writing the file. That's because only the meta-data is // journalled. Syncing the file slows down the system, but assures it *** ../vim-8.2.2159/src/cindent.c 2020-05-31 17:49:21.776435849 +0200 --- src/cindent.c 2020-12-18 19:41:21.623585499 +0100 *************** *** 2121,2127 **** } // #defines and so on go at the left when included in 'cinkeys', ! // exluding pragmas when customized in 'cinoptions' if (*theline == '#' && (*linecopy == '#' || in_cinkeys('#', ' ', TRUE))) { char_u *directive = skipwhite(theline + 1); --- 2121,2127 ---- } // #defines and so on go at the left when included in 'cinkeys', ! // excluding pragmas when customized in 'cinoptions' if (*theline == '#' && (*linecopy == '#' || in_cinkeys('#', ' ', TRUE))) { char_u *directive = skipwhite(theline + 1); *** ../vim-8.2.2159/src/cmdexpand.c 2020-09-26 15:08:52.881779910 +0200 --- src/cmdexpand.c 2020-12-18 19:41:21.623585499 +0100 *************** *** 1049,1055 **** ++p; } ! // If the cursor is touching the command, and it ends in an alpha-numeric // character, complete the command name. if (*p == NUL && ASCII_ISALNUM(p[-1])) return NULL; --- 1049,1055 ---- ++p; } ! // If the cursor is touching the command, and it ends in an alphanumeric // character, complete the command name. if (*p == NUL && ASCII_ISALNUM(p[-1])) return NULL; *** ../vim-8.2.2159/src/eval.c 2020-12-13 20:26:25.928035621 +0100 --- src/eval.c 2020-12-18 19:41:21.623585499 +0100 *************** *** 4631,4637 **** * "numbuf" is used for a number. * When "copyID" is not NULL replace recursive lists and dicts with "...". * When both "echo_style" and "composite_val" are FALSE, put quotes around ! * stings as "string()", otherwise does not put quotes around strings, as * ":echo" displays values. * When "restore_copyID" is FALSE, repeated items in dictionaries and lists * are replaced with "...". --- 4631,4637 ---- * "numbuf" is used for a number. * When "copyID" is not NULL replace recursive lists and dicts with "...". * When both "echo_style" and "composite_val" are FALSE, put quotes around ! * strings as "string()", otherwise does not put quotes around strings, as * ":echo" displays values. * When "restore_copyID" is FALSE, repeated items in dictionaries and lists * are replaced with "...". *** ../vim-8.2.2159/src/ex_cmds.c 2020-11-25 20:09:05.513445582 +0100 --- src/ex_cmds.c 2020-12-18 19:41:21.623585499 +0100 *************** *** 2660,2666 **** if (tlnum <= 0) tlnum = 1L; } ! // Add BLN_NOCURWIN to avoid a new wininfo items are assocated // with the current window. newbuf = buflist_new(ffname, sfname, tlnum, BLN_LISTED | BLN_NOCURWIN); --- 2660,2666 ---- if (tlnum <= 0) tlnum = 1L; } ! // Add BLN_NOCURWIN to avoid a new wininfo items are associated // with the current window. newbuf = buflist_new(ffname, sfname, tlnum, BLN_LISTED | BLN_NOCURWIN); *** ../vim-8.2.2159/src/feature.h 2020-11-25 21:55:41.011368741 +0100 --- src/feature.h 2020-12-18 19:41:21.623585499 +0100 *************** *** 937,943 **** * +mouse_sgr Unix only: Include code for for SGR-styled mouse. * +mouse_sysmouse Unix only: Include code for FreeBSD and DragonFly * console mouse handling. ! * +mouse_urxvt Unix only: Include code for for urxvt mosue handling. * +mouse Any mouse support (any of the above enabled). * Always included, since either FEAT_MOUSE_XTERM or * DOS_MOUSE is defined. --- 937,943 ---- * +mouse_sgr Unix only: Include code for for SGR-styled mouse. * +mouse_sysmouse Unix only: Include code for FreeBSD and DragonFly * console mouse handling. ! * +mouse_urxvt Unix only: Include code for for urxvt mouse handling. * +mouse Any mouse support (any of the above enabled). * Always included, since either FEAT_MOUSE_XTERM or * DOS_MOUSE is defined. *** ../vim-8.2.2159/src/getchar.c 2020-12-03 19:54:38.177924280 +0100 --- src/getchar.c 2020-12-18 19:41:21.623585499 +0100 *************** *** 2264,2270 **** } /* ! * Check if typebuf.tb_buf[] contains a modifer plus key that can be changed * into just a key, apply that. * Check from typebuf.tb_buf[typebuf.tb_off] to typebuf.tb_buf[typebuf.tb_off * + "max_offset"]. --- 2264,2270 ---- } /* ! * Check if typebuf.tb_buf[] contains a modifier plus key that can be changed * into just a key, apply that. * Check from typebuf.tb_buf[typebuf.tb_off] to typebuf.tb_buf[typebuf.tb_off * + "max_offset"]. *** ../vim-8.2.2159/src/gui_haiku.cc 2020-08-13 21:05:31.785361610 +0200 --- src/gui_haiku.cc 2020-12-18 19:41:21.627585483 +0100 *************** *** 3411,3417 **** thread_id tid = gui.vimWindow->Thread(); gui.vimWindow->Lock(); gui.vimWindow->Quit(); ! // Wait until it is truely gone int32 exitcode; wait_for_thread(tid, &exitcode); } --- 3411,3417 ---- thread_id tid = gui.vimWindow->Thread(); gui.vimWindow->Lock(); gui.vimWindow->Quit(); ! // Wait until it is truly gone int32 exitcode; wait_for_thread(tid, &exitcode); } *** ../vim-8.2.2159/src/gui_xmdlg.c 2019-12-02 22:47:38.000000000 +0100 --- src/gui_xmdlg.c 2020-12-18 19:41:21.627585483 +0100 *************** *** 497,503 **** } /* ! * Now loop trough the remaining lists and set them up. */ for (idx = (int)NAME; idx < (int)NONE; ++idx) { --- 497,503 ---- } /* ! * Now loop through the remaining lists and set them up. */ for (idx = (int)NAME; idx < (int)NONE; ++idx) { *** ../vim-8.2.2159/src/help.c 2020-10-24 20:49:37.498683038 +0200 --- src/help.c 2020-12-18 19:41:21.627585483 +0100 *************** *** 325,331 **** char_u *s, *d; int i; // Specific tags that either have a specific replacement or won't go ! // throught the generic rules. static char *(except_tbl[][2]) = { {"*", "star"}, {"g*", "gstar"}, --- 325,331 ---- char_u *s, *d; int i; // Specific tags that either have a specific replacement or won't go ! // through the generic rules. static char *(except_tbl[][2]) = { {"*", "star"}, {"g*", "gstar"}, *************** *** 647,652 **** --- 647,654 ---- // Always set these options after jumping to a help tag, because the // user may have an autocommand that gets in the way. + // When adding an option here, also update the help file helphelp.txt. + // Accept all ASCII chars for keywords, except ' ', '*', '"', '|', and // latin1 word characters (for translated help files). // Only set it when needed, buf_init_chartab() is some work. *** ../vim-8.2.2159/src/if_ole.cpp 2020-06-24 20:33:59.565106319 +0200 --- src/if_ole.cpp 2020-12-18 19:41:21.627585483 +0100 *************** *** 635,641 **** LPOLESTR wGUID = NULL; StringFromCLSID(guid, &wGUID); ! // Covert from wide characters to non-wide wcstombs(GUID, wGUID, length); // Free memory --- 635,641 ---- LPOLESTR wGUID = NULL; StringFromCLSID(guid, &wGUID); ! // Convert from wide characters to non-wide wcstombs(GUID, wGUID, length); // Free memory *** ../vim-8.2.2159/src/insexpand.c 2020-12-12 13:31:51.277403018 +0100 --- src/insexpand.c 2020-12-18 19:41:21.627585483 +0100 *************** *** 3628,3634 **** // line (probably) wrapped, set compl_startpos to the // first non_blank in the line, if it is not a wordchar // include it to get a better pattern, but then we don't ! // want the "\\<" prefix, check it bellow compl_col = (colnr_T)getwhitecols(line); compl_startpos.col = compl_col; compl_startpos.lnum = curwin->w_cursor.lnum; --- 3628,3634 ---- // line (probably) wrapped, set compl_startpos to the // first non_blank in the line, if it is not a wordchar // include it to get a better pattern, but then we don't ! // want the "\\<" prefix, check it below compl_col = (colnr_T)getwhitecols(line); compl_startpos.col = compl_col; compl_startpos.lnum = curwin->w_cursor.lnum; *** ../vim-8.2.2159/src/list.c 2020-12-01 21:08:01.969599029 +0100 --- src/list.c 2020-12-18 19:41:21.627585483 +0100 *************** *** 2693,2699 **** } /* ! * "reduce(list, { accumlator, element -> value } [, initial])" function */ void f_reduce(typval_T *argvars, typval_T *rettv) --- 2693,2699 ---- } /* ! * "reduce(list, { accumulator, element -> value } [, initial])" function */ void f_reduce(typval_T *argvars, typval_T *rettv) *** ../vim-8.2.2159/src/map.c 2020-11-12 14:20:32.021927293 +0100 --- src/map.c 2020-12-18 19:41:21.627585483 +0100 *************** *** 2221,2227 **** if (did_simplify) { // When the lhs is being simplified the not-simplified keys are ! // preferred for priting, like in do_map(). // The "rhs" and "buffer_local" values are not expected to change. mp_simplified = mp; (void)replace_termcodes(keys, &alt_keys_buf, --- 2221,2227 ---- if (did_simplify) { // When the lhs is being simplified the not-simplified keys are ! // preferred for printing, like in do_map(). // The "rhs" and "buffer_local" values are not expected to change. mp_simplified = mp; (void)replace_termcodes(keys, &alt_keys_buf, *** ../vim-8.2.2159/src/memline.c 2020-11-21 13:51:12.421860319 +0100 --- src/memline.c 2020-12-18 19:41:21.627585483 +0100 *************** *** 5562,5568 **** && buf->b_ml.ml_line_count - line <= 1) { /* ! * We are in the last chunk and it is cheap to crate a new one * after this. Do it now to avoid the loop above later on */ curchnk = buf->b_ml.ml_chunksize + curix + 1; --- 5562,5568 ---- && buf->b_ml.ml_line_count - line <= 1) { /* ! * We are in the last chunk and it is cheap to create a new one * after this. Do it now to avoid the loop above later on */ curchnk = buf->b_ml.ml_chunksize + curix + 1; *** ../vim-8.2.2159/src/normal.c 2020-12-11 19:30:26.789393285 +0100 --- src/normal.c 2020-12-18 19:41:21.627585483 +0100 *************** *** 5372,5378 **** nv_subst(cmdarg_T *cap) { #ifdef FEAT_TERMINAL ! // When showing output of term_dumpdiff() swap the top and botom. if (term_swap_diff() == OK) return; #endif --- 5372,5378 ---- nv_subst(cmdarg_T *cap) { #ifdef FEAT_TERMINAL ! // When showing output of term_dumpdiff() swap the top and bottom. if (term_swap_diff() == OK) return; #endif *** ../vim-8.2.2159/src/os_win32.c 2020-12-04 19:42:48.431278293 +0100 --- src/os_win32.c 2020-12-18 19:45:17.270632294 +0100 *************** *** 7113,7125 **** /* * SUB STREAM (aka info stream) handling: * ! * NTFS can have sub streams for each file. Normal contents of file is ! * stored in the main stream, and extra contents (author information and ! * title and so on) can be stored in sub stream. After Windows 2000, user ! * can access and store those informations in sub streams via explorer's ! * property menuitem in right click menu. Those informations in sub streams ! * were lost when copying only the main stream. So we have to copy sub ! * streams. * * Incomplete explanation: * http://msdn.microsoft.com/library/en-us/dnw2k/html/ntfs5.asp --- 7113,7124 ---- /* * SUB STREAM (aka info stream) handling: * ! * NTFS can have sub streams for each file. The normal contents of a file is ! * stored in the main stream, and extra contents (author information, title and ! * so on) can be stored in a sub stream. After Windows 2000, the user can ! * access and store this information in sub streams via an explorer's property ! * menu item in the right click menu. This information in sub streams was lost ! * when copying only the main stream. Therefore we have to copy sub streams. * * Incomplete explanation: * http://msdn.microsoft.com/library/en-us/dnw2k/html/ntfs5.asp *** ../vim-8.2.2159/src/search.c 2020-10-29 18:57:57.791880416 +0100 --- src/search.c 2020-12-18 19:41:21.631585469 +0100 *************** *** 3753,3759 **** // we read a line, set "already" to check this "line" later // if depth >= 0 we'll increase files[depth].lnum far ! // bellow -- Acevedo already = aux = p = skipwhite(line); p = find_word_start(p); p = find_word_end(p); --- 3753,3759 ---- // we read a line, set "already" to check this "line" later // if depth >= 0 we'll increase files[depth].lnum far ! // below -- Acevedo already = aux = p = skipwhite(line); p = find_word_start(p); p = find_word_end(p); *** ../vim-8.2.2159/src/term.c 2020-11-21 12:44:48.507365103 +0100 --- src/term.c 2020-12-18 19:41:21.631585469 +0100 *************** *** 3744,3750 **** #endif LOG_TR(("Sending xterm compatibility test sequence.")); // Do this in the third row. Second row is used by ambiguous ! // chararacter width check. term_windgoto(2, 0); // send the test DCS string. out_str((char_u *)"\033Pzz\033\\"); --- 3744,3750 ---- #endif LOG_TR(("Sending xterm compatibility test sequence.")); // Do this in the third row. Second row is used by ambiguous ! // character width check. term_windgoto(2, 0); // send the test DCS string. out_str((char_u *)"\033Pzz\033\\"); *************** *** 4531,4537 **** /* * Handle a response to T_CRV: {lead}{first}{x};{vers};{y}c ! * Xterm and alikes use '>' for {first}. * Rxvt sends "{lead}?1;2c". */ static void --- 4531,4537 ---- /* * Handle a response to T_CRV: {lead}{first}{x};{vers};{y}c ! * Xterm and alike use '>' for {first}. * Rxvt sends "{lead}?1;2c". */ static void *** ../vim-8.2.2159/src/testdir/test_arglist.vim 2020-10-05 20:07:14.413414315 +0200 --- src/testdir/test_arglist.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 524,530 **** bwipe Xa.c Xb.c Xc.c endfunc ! " Test for quiting Vim with unedited files in the argument list func Test_quit_with_arglist() CheckRunVimInTerminal let buf = RunVimInTerminal('', {'rows': 6}) --- 524,530 ---- bwipe Xa.c Xb.c Xc.c endfunc ! " Test for quitting Vim with unedited files in the argument list func Test_quit_with_arglist() CheckRunVimInTerminal let buf = RunVimInTerminal('', {'rows': 6}) *** ../vim-8.2.2159/src/testdir/test_autocmd.vim 2020-11-27 19:13:24.186184976 +0100 --- src/testdir/test_autocmd.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 2324,2330 **** call writefile(lines, 'XSafeState') let buf = RunVimInTerminal('-S XSafeState', #{rows: 6}) ! " Sometimes we loop to handle a K_IGNORE, SafeState may be trigered once or " more often. call term_sendkeys(buf, ":echo g:safe\") call WaitForAssert({-> assert_match('^\d ', term_getline(buf, 6))}, 1000) --- 2324,2330 ---- call writefile(lines, 'XSafeState') let buf = RunVimInTerminal('-S XSafeState', #{rows: 6}) ! " Sometimes we loop to handle a K_IGNORE, SafeState may be triggered once or " more often. call term_sendkeys(buf, ":echo g:safe\") call WaitForAssert({-> assert_match('^\d ', term_getline(buf, 6))}, 1000) *** ../vim-8.2.2159/src/testdir/test_debugger.vim 2020-11-22 14:23:57.059233488 +0100 --- src/testdir/test_debugger.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 974,980 **** \ 'line 1: let s:file1_var = ''file1''' \ ], #{msec: 5000}) ! " step throught the initial declarations call RunDbgCmd(buf, 'step', [ 'line 2: let g:global_var = ''global''' ] ) call RunDbgCmd(buf, 'step', [ 'line 4: func s:File1Func( arg )' ] ) call RunDbgCmd(buf, 'echo s:file1_var', [ 'file1' ] ) --- 974,980 ---- \ 'line 1: let s:file1_var = ''file1''' \ ], #{msec: 5000}) ! " step through the initial declarations call RunDbgCmd(buf, 'step', [ 'line 2: let g:global_var = ''global''' ] ) call RunDbgCmd(buf, 'step', [ 'line 4: func s:File1Func( arg )' ] ) call RunDbgCmd(buf, 'echo s:file1_var', [ 'file1' ] ) *** ../vim-8.2.2159/src/testdir/test_increment.vim 2020-06-12 20:19:37.976526305 +0200 --- src/testdir/test_increment.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 284,290 **** " 1 " 1 " 1 ! " Expexted: " 1) g Ctrl-A on block selected indented lines " 2 " 1 --- 284,290 ---- " 1 " 1 " 1 ! " Expected: " 1) g Ctrl-A on block selected indented lines " 2 " 1 *** ../vim-8.2.2159/src/testdir/test_menu.vim 2020-08-12 18:50:31.883655785 +0200 --- src/testdir/test_menu.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 426,432 **** nunmenu Test.Sign endfunc ! " Test for "icon=filname" in a toolbar func Test_menu_icon() CheckFeature toolbar nmenu icon=myicon.xpm Toolbar.Foo :echo "Foo" --- 426,432 ---- nunmenu Test.Sign endfunc ! " Test for "icon=filename" in a toolbar func Test_menu_icon() CheckFeature toolbar nmenu icon=myicon.xpm Toolbar.Foo :echo "Foo" *** ../vim-8.2.2159/src/testdir/test_netbeans.vim 2020-11-16 18:39:39.338566134 +0100 --- src/testdir/test_netbeans.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 839,845 **** call s:run_server('Nb_file_auth') endfunc ! " Test for quiting Vim with an open netbeans connection func Nb_quit_with_conn(port) call delete("Xnetbeans") call writefile([], "Xnetbeans") --- 839,845 ---- call s:run_server('Nb_file_auth') endfunc ! " Test for quitting Vim with an open netbeans connection func Nb_quit_with_conn(port) call delete("Xnetbeans") call writefile([], "Xnetbeans") *** ../vim-8.2.2159/src/testdir/test_popupwin.vim 2020-12-17 22:27:34.633086324 +0100 --- src/testdir/test_popupwin.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 3308,3314 **** call term_sendkeys(buf, "cc\\") call VerifyScreenDump(buf, 'Test_popupwin_infopopup_6', {}) ! " Hide the info popup, cycle trough buffers, make sure it didn't get " deleted. call term_sendkeys(buf, "\") call term_sendkeys(buf, ":set hidden\") --- 3308,3314 ---- call term_sendkeys(buf, "cc\\") call VerifyScreenDump(buf, 'Test_popupwin_infopopup_6', {}) ! " Hide the info popup, cycle through buffers, make sure it didn't get " deleted. call term_sendkeys(buf, "\") call term_sendkeys(buf, ":set hidden\") *** ../vim-8.2.2159/src/testdir/test_python2.vim 2020-11-04 12:23:01.328933876 +0100 --- src/testdir/test_python2.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 3692,3698 **** call assert_equal(expected, getline(2, '$')) close! ! " Try to import a non-existing moudle with a dot (.) call AssertException(['py import a.b.c'], 'ImportError:') endfunc --- 3692,3698 ---- call assert_equal(expected, getline(2, '$')) close! ! " Try to import a non-existing module with a dot (.) call AssertException(['py import a.b.c'], 'ImportError:') endfunc *** ../vim-8.2.2159/src/testdir/test_python3.vim 2020-11-04 12:23:01.328933876 +0100 --- src/testdir/test_python3.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 3882,3888 **** call assert_equal(expected, getline(2, '$')) close! ! " Try to import a non-existing moudle with a dot (.) call AssertException(['py3 import a.b.c'], "No module named 'a'") endfunc --- 3882,3888 ---- call assert_equal(expected, getline(2, '$')) close! ! " Try to import a non-existing module with a dot (.) call AssertException(['py3 import a.b.c'], "No module named 'a'") endfunc *** ../vim-8.2.2159/src/testdir/test_sort.vim 2020-11-03 18:51:50.505968361 +0100 --- src/testdir/test_sort.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 1328,1334 **** endif endfor ! " Needs atleast two lines for this test call setline(1, ['line1', 'line2']) call assert_fails('sort no', 'E474:') call assert_fails('sort c', 'E475:') --- 1328,1334 ---- endif endfor ! " Needs at least two lines for this test call setline(1, ['line1', 'line2']) call assert_fails('sort no', 'E474:') call assert_fails('sort c', 'E475:') *** ../vim-8.2.2159/src/testdir/test_terminal2.vim 2020-09-26 22:39:18.427725844 +0200 --- src/testdir/test_terminal2.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 287,293 **** unlet g:job endfunc ! " TODO: reenable when this no longer hangs on Travis "func Test_zz2_terminal_guioptions_bang() " CheckGui " set guioptions+=! --- 287,293 ---- unlet g:job endfunc ! " TODO: re-enable when this no longer hangs on Travis "func Test_zz2_terminal_guioptions_bang() " CheckGui " set guioptions+=! *************** *** 338,344 **** let bnr = bufnr('$') call WaitForAssert({-> assert_equal('running', term_getstatus(bnr))}) " In the GUI the first switch sometimes doesn't work. Switch twice to avoid ! " flakyness. call feedkeys("\N", 'xt') call feedkeys("A", 'xt') call WaitForAssert({-> assert_equal('running', term_getstatus(bnr))}) --- 338,344 ---- let bnr = bufnr('$') call WaitForAssert({-> assert_equal('running', term_getstatus(bnr))}) " In the GUI the first switch sometimes doesn't work. Switch twice to avoid ! " flakiness. call feedkeys("\N", 'xt') call feedkeys("A", 'xt') call WaitForAssert({-> assert_equal('running', term_getstatus(bnr))}) *** ../vim-8.2.2159/src/testdir/test_terminal3.vim 2020-11-01 20:58:22.835423347 +0100 --- src/testdir/test_terminal3.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 145,151 **** call delete('XtermPopup') endfunc ! " Check a terminal in popup window uses the default mininum size. func Test_terminal_in_popup_min_size() CheckRunVimInTerminal --- 145,151 ---- call delete('XtermPopup') endfunc ! " Check a terminal in popup window uses the default minimum size. func Test_terminal_in_popup_min_size() CheckRunVimInTerminal *** ../vim-8.2.2159/src/testdir/test_vartabs.vim 2020-08-12 18:50:31.887655765 +0200 --- src/testdir/test_vartabs.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 97,103 **** .retab! call assert_equal("\t\t\t\tl", getline(1)) ! " Test for 'retab' with same vlaues as vts set ts=8 sts=0 vts=5,3,6,2 vsts= exe "norm! S l" .retab! 5,3,6,2 --- 97,103 ---- .retab! call assert_equal("\t\t\t\tl", getline(1)) ! " Test for 'retab' with same values as vts set ts=8 sts=0 vts=5,3,6,2 vsts= exe "norm! S l" .retab! 5,3,6,2 *** ../vim-8.2.2159/src/testdir/test_vimscript.vim 2020-12-13 20:26:25.928035621 +0100 --- src/testdir/test_vimscript.vim 2020-12-18 19:41:21.631585469 +0100 *************** *** 7374,7380 **** endtry call assert_equal(1, caught_e884) ! " function name folowed by # let caught_e128 = 0 try func! test2() "# --- 7374,7380 ---- endtry call assert_equal(1, caught_e884) ! " function name followed by # let caught_e128 = 0 try func! test2() "# *** ../vim-8.2.2159/src/textprop.c 2020-09-20 21:04:31.811898396 +0200 --- src/textprop.c 2020-12-18 19:41:21.631585469 +0100 *************** *** 302,308 **** if (length < 0) length = 0; // zero-width property ! // Allocate the new line with space for the new proprety. newtext = alloc(buf->b_ml.ml_line_len + sizeof(textprop_T)); if (newtext == NULL) return; --- 302,308 ---- if (length < 0) length = 0; // zero-width property ! // Allocate the new line with space for the new property. newtext = alloc(buf->b_ml.ml_line_len + sizeof(textprop_T)); if (newtext == NULL) return; *************** *** 1485,1491 **** end = !(prop.tp_flags & TP_FLAG_CONT_NEXT); adjust_prop(&prop, 0, -removed, 0); // Remove leading spaces ! adjust_prop(&prop, -1, col, 0); // Make line start at its final colum if (add_all || end) mch_memmove(new_props + --(*props_remaining) * sizeof(prop), --- 1485,1491 ---- end = !(prop.tp_flags & TP_FLAG_CONT_NEXT); adjust_prop(&prop, 0, -removed, 0); // Remove leading spaces ! adjust_prop(&prop, -1, col, 0); // Make line start at its final column if (add_all || end) mch_memmove(new_props + --(*props_remaining) * sizeof(prop), *** ../vim-8.2.2159/src/userfunc.c 2020-12-13 21:16:52.348872670 +0100 --- src/userfunc.c 2020-12-18 19:41:21.631585469 +0100 *************** *** 1409,1415 **** /* * Restore the function call depth. This is for cases where there is no ! * garantee funcdepth_decrement() can be called exactly the same number of * times as funcdepth_increment(). */ void --- 1409,1415 ---- /* * Restore the function call depth. This is for cases where there is no ! * guarantee funcdepth_decrement() can be called exactly the same number of * times as funcdepth_increment(). */ void *** ../vim-8.2.2159/src/vim9.h 2020-12-10 19:43:36.629155311 +0100 --- src/vim9.h 2020-12-18 19:41:21.635585449 +0100 *************** *** 53,59 **** // ISN_STOREOTHER, // pop into other script variable isn_arg.other. ISN_STORENR, // store number into local variable isn_arg.storenr.stnr_idx ! ISN_STORELIST, // store into list, value/index/varable on stack ISN_STOREDICT, // store into dictionary, value/index/variable on stack ISN_UNLET, // unlet variable isn_arg.unlet.ul_name --- 53,59 ---- // ISN_STOREOTHER, // pop into other script variable isn_arg.other. ISN_STORENR, // store number into local variable isn_arg.storenr.stnr_idx ! ISN_STORELIST, // store into list, value/index/variable on stack ISN_STOREDICT, // store into dictionary, value/index/variable on stack ISN_UNLET, // unlet variable isn_arg.unlet.ul_name *** ../vim-8.2.2159/src/vim9compile.c 2020-12-15 21:28:53.660000912 +0100 --- src/vim9compile.c 2020-12-18 19:47:19.862154305 +0100 *************** *** 318,324 **** } /* ! * Returnd TRUE if the script context is Vim9 script. */ static int script_is_vim9() --- 318,324 ---- } /* ! * Return TRUE if the script context is Vim9 script. */ static int script_is_vim9() *************** *** 1958,1964 **** if (isn->isn_arg.cmdmod.cf_cmdmod == NULL) return FAIL; mch_memmove(isn->isn_arg.cmdmod.cf_cmdmod, cmod, sizeof(cmdmod_T)); ! // filter progam now belongs to the instruction cmod->cmod_filter_regmatch.regprog = NULL; } --- 1958,1964 ---- if (isn->isn_arg.cmdmod.cf_cmdmod == NULL) return FAIL; mch_memmove(isn->isn_arg.cmdmod.cf_cmdmod, cmod, sizeof(cmdmod_T)); ! // filter program now belongs to the instruction cmod->cmod_filter_regmatch.regprog = NULL; } *************** *** 3507,3513 **** } } ! // Do not skip over white space to find the "(", "exeucte 'x' ()" is // not a function call. if (**arg == '(') { --- 3507,3513 ---- } } ! // Do not skip over white space to find the "(", "execute 'x' ()" is // not a function call. if (**arg == '(') { *************** *** 6835,6841 **** * ... try block * " catch {expr}" * JUMP -> finally ! * catch1: PUSH exeception * EVAL {expr} * MATCH * JUMP nomatch -> catch2 --- 6835,6841 ---- * ... try block * " catch {expr}" * JUMP -> finally ! * catch1: PUSH exception * EVAL {expr} * MATCH * JUMP nomatch -> catch2 *************** *** 7132,7138 **** } /* ! * If "eap" has a range that is not a contstant generate an ISN_RANGE * instruction to compute it and return OK. * Otherwise return FAIL, the caller must deal with any range. */ --- 7132,7138 ---- } /* ! * If "eap" has a range that is not a constant generate an ISN_RANGE * instruction to compute it and return OK. * Otherwise return FAIL, the caller must deal with any range. */ *** ../vim-8.2.2159/src/vim9execute.c 2020-12-18 17:23:11.014359533 +0100 --- src/vim9execute.c 2020-12-18 19:41:21.635585449 +0100 *************** *** 3137,3143 **** } /* ! * ":dissassemble". * We don't really need this at runtime, but we do have tests that require it, * so always include this. */ --- 3137,3143 ---- } /* ! * ":disassemble". * We don't really need this at runtime, but we do have tests that require it, * so always include this. */ *** ../vim-8.2.2159/src/version.c 2020-12-18 17:23:11.014359533 +0100 --- src/version.c 2020-12-18 19:49:27.213667065 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2160, /**/ -- | Ceci n'est pas une pipe. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///