# HG changeset patch # User Christian Brabandt # Date 1694252704 -7200 # Node ID def9fc5c92d12fd65fffe489066bd20808a991c3 # Parent 1e37f623c5510f18883e983aeb1ea25bb0fdd237 patch 9.0.1886: Various Typos Commit: https://github.com/vim/vim/commit/ee17b6f70d382ec6c5d8d27b56c4e84106ac8c55 Author: Christian Brabandt Date: Sat Sep 9 11:23:50 2023 +0200 patch 9.0.1886: Various Typos Problem: Various Typos Solution: Fix Typos This is a collection of typo related commits. closes: #12753 closes: #13016 Co-authored-by: Adri Verhoef Co-authored-by: zeertzjq Co-authored-by: Viktor Sz?pe Co-authored-by: nuid64 Co-authored-by: Meng Xiangzhuo Co-authored-by: Dominique Pell? Signed-off-by: Christian Brabandt diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -2207,7 +2207,7 @@ environ() *environ()* err_teapot([{expr}]) *err_teapot()* Produce an error with number 418, needed for implementation of - RFC 2325. + RFC 2324. If {expr} is present and it is TRUE error 503 is given, indicating that coffee is temporarily not available. If {expr} is present it must be a String. @@ -6786,7 +6786,7 @@ printf({fmt}, {expr1} ...) *printf()* *printf-$* In certain languages, error and informative messages are more readable when the order of words is different from the - corresponding message in English. To accomodate translations + corresponding message in English. To accommodate translations having a different word order, positional arguments may be used to indicate this. For instance: > diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -127,7 +127,7 @@ CTRL-R {register} *i_CTRL-R* '/' the last search pattern ':' the last command-line '.' the last inserted text - *i_CTRL-R_-* + *i_CTRL-R_-* '-' the last small (less than a line) delete register. This is repeatable using |.| since it remembers the register to put instead of diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -189,7 +189,7 @@ CTRL-W v *CTRL-W_v* it doesn't! CTRL-W n *CTRL-W_n* -CTRL-W CTRL_N *CTRL-W_CTRL-N* +CTRL-W CTRL-N *CTRL-W_CTRL-N* :[N]new [++opt] [+cmd] *:new* Create a new window and start editing an empty file in it. Make new window N high (default is to use half the existing diff --git a/runtime/ftplugin/zig.vim b/runtime/ftplugin/zig.vim --- a/runtime/ftplugin/zig.vim +++ b/runtime/ftplugin/zig.vim @@ -39,7 +39,7 @@ endif let &l:define='\v(|||^\s*\#\s*define)' -" Safety check: don't execute zip from current directory +" Safety check: don't execute zig from current directory if !exists('g:zig_std_dir') && exists('*json_decode') && \ executable('zig') && get(g:, 'zig_exec', get(g:, 'plugin_exec', 0)) \ && (fnamemodify(exepath("zig"), ":p:h") != s:tmp_cwd diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -345,7 +345,7 @@ CClink = $(CC) # --enable-gui=gtk or leave out --enable-gnome-check. # # GNOME makes sense only for GTK+ 2. Avoid use of --enable-gnome-check with -# GTK+ 3 build, as the functionality of GNOME is already incooperated into +# GTK+ 3 build, as the functionality of GNOME is already incorporated into # GTK+ 3. # # If the selected GUI isn't found, the GUI is disabled automatically diff --git a/src/errors.h b/src/errors.h --- a/src/errors.h +++ b/src/errors.h @@ -3516,7 +3516,7 @@ EXTERN char e_invalid_format_specifier_s EXTERN char e_member_str_type_mismatch_expected_str_but_got_str[] INIT(= N_("E1406: Member \"%s\": type mismatch, expected %s but got %s")); EXTERN char e_method_str_type_mismatch_expected_str_but_got_str[] - INIT(= N_("E1407: Member \"%s\": type mismatch, expected %s but got %s")); + INIT(= N_("E1407: Method \"%s\": type mismatch, expected %s but got %s")); EXTERN char e_aptypes_is_null_nr_str[] INIT(= "E1408: Internal error: ap_types or ap_types[idx] is NULL: %d: %s"); EXTERN char e_interface_static_direct_access_str[] diff --git a/src/ex_cmds.c b/src/ex_cmds.c --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2647,9 +2647,9 @@ do_ecmd( } - // End Visual mode before switching to another buffer, so the text can be - // copied into the GUI selection buffer. - // Careful: may trigger ModeChanged() autocommand + // End Visual mode before switching to another buffer, so the text can be + // copied into the GUI selection buffer. + // Careful: may trigger ModeChanged() autocommand // Should we block autocommands here? reset_VIsual(); diff --git a/src/findfile.c b/src/findfile.c --- a/src/findfile.c +++ b/src/findfile.c @@ -48,8 +48,8 @@ * * ATTENTION: * ========== - * Also we use an allocated search context here, this functions are NOT - * thread-safe!!!!! + * Also we use an allocated search context here, these functions are NOT + * thread-safe! * * To minimize parameter passing (or because I'm to lazy), only the * external visible functions get a search context as a parameter. This is diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -4002,8 +4002,8 @@ gui_mch_init(void) } // Real windows can get focus ... GtkPlug, being a mere container can't, - // only its widgets. Arguably, this could be common code and we not use - // the window focus at all, but let's be safe. + // only its widgets. Arguably, this could be common code and we do not + // use the window focus at all, but let's be safe. if (gtk_socket_id == 0) { g_signal_connect(G_OBJECT(gui.mainwin), "focus-out-event", diff --git a/src/insexpand.c b/src/insexpand.c --- a/src/insexpand.c +++ b/src/insexpand.c @@ -3789,7 +3789,7 @@ ins_compl_get_exp(pos_T *ini) st.found_all = FALSE; st.ins_buf = curbuf; vim_free(st.e_cpt_copy); - // Make a copy of 'complete', if case the buffer is wiped out. + // Make a copy of 'complete', in case the buffer is wiped out. st.e_cpt_copy = vim_strsave((compl_cont_status & CONT_LOCAL) ? (char_u *)"." : curbuf->b_p_cpt); st.e_cpt = st.e_cpt_copy == NULL ? (char_u *)"" : st.e_cpt_copy; diff --git a/src/main.c b/src/main.c --- a/src/main.c +++ b/src/main.c @@ -1548,7 +1548,7 @@ main_loop( && !skip_term_loop) { // If terminal_loop() returns OK we got a key that is handled - // in Normal model. With FAIL we first need to position the + // in Normal mode. With FAIL we first need to position the // cursor and the screen needs to be redrawn. if (terminal_loop(TRUE) == OK) normal_cmd(&oa, TRUE); diff --git a/src/mbyte.c b/src/mbyte.c --- a/src/mbyte.c +++ b/src/mbyte.c @@ -4050,7 +4050,7 @@ utf_allow_break_before(int cc) 0x2021, // â€¡ double dagger 0x2026, // â€¦ horizontal ellipsis 0x2030, // â€° per mille sign - 0x2031, // â€± per then thousand sign + 0x2031, // â€± per ten thousand sign 0x203c, // â€¼ double exclamation mark 0x2047, // â‡ double question mark 0x2048, // âˆ question exclamation mark diff --git a/src/mouse.c b/src/mouse.c --- a/src/mouse.c +++ b/src/mouse.c @@ -2162,7 +2162,7 @@ retnomove: do_mousescroll_horiz(long_u leftcol) { if (curwin->w_p_wrap) - return FALSE; // no wrapping, no scrolling + return FALSE; // no horizontal scrolling when wrapping if (curwin->w_leftcol == (colnr_T)leftcol) return FALSE; // already there diff --git a/src/po/README.txt b/src/po/README.txt --- a/src/po/README.txt +++ b/src/po/README.txt @@ -41,7 +41,7 @@ You might have to do the commands manual WHEN THERE IS A MISTAKE If you find there is a mistake in one of the translations, please report this -to the maintainer of the translation. His/her E-mail address is in the +to the maintainer of the translation. His/her e-mail address is in the comments at the start of the file. You can also see this with the ":messages" command in Vim when the translation is being used. diff --git a/src/po/README_mingw.txt b/src/po/README_mingw.txt --- a/src/po/README_mingw.txt +++ b/src/po/README_mingw.txt @@ -60,7 +60,7 @@ the same as in the Unix case, only the c There is one special message: msgid "Messages maintainer: The Vim Project" - You should include your name and E-mail address instead, for example: + You should include your name and e-mail address instead, for example: msgstr "Berichten übersetzt bei: John Doe " (3) Clean up diff --git a/src/sound.c b/src/sound.c --- a/src/sound.c +++ b/src/sound.c @@ -17,7 +17,7 @@ static long sound_id = 0; -// soundcb_T is typdef'ed in proto/sound.pro +// soundcb_T is typedef'ed in proto/sound.pro struct soundcb_S { callback_T snd_callback; diff --git a/src/term.c b/src/term.c --- a/src/term.c +++ b/src/term.c @@ -6655,7 +6655,7 @@ replace_termcodes( #ifdef FEAT_EVAL /* * Change Func to K_SNR _Func. This name is used - * for script-locla user functions. + * for script-local user functions. * (room: 5 * 6 = 30 bytes; needed: 3 + + 1 <= 14) * Also change name.Func to K_SNR _Func. * Only if "name" is recognized as an import. diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2025,8 +2025,8 @@ endfunc " Test for BufUnload autocommand that unloads all the other buffers func Test_bufunload_all() let g:test_is_flaky = 1 - call writefile(['Test file Xxx1'], 'Xxx1', 'D')" - call writefile(['Test file Xxx2'], 'Xxx2', 'D')" + call writefile(['Test file Xxx1'], 'Xxx1', 'D') + call writefile(['Test file Xxx2'], 'Xxx2', 'D') let content =<< trim [CODE] func UnloadAllBufs() diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -524,7 +524,7 @@ func Test_connect_waittime() let start = reltime() let handle = ch_open('localhost:9876', s:chopt) if ch_status(handle) != "fail" - " Oops, port does exists. + " Oops, port exists. call ch_close(handle) else let elapsed = reltime(start) @@ -538,7 +538,7 @@ func Test_connect_waittime() try let handle = ch_open('localhost:9867', {'waittime': 500}) if ch_status(handle) != "fail" - " Oops, port does exists. + " Oops, port exists. call ch_close(handle) else " Failed connection should wait about 500 msec. Can be longer if the diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim --- a/src/testdir/test_edit.vim +++ b/src/testdir/test_edit.vim @@ -1219,7 +1219,7 @@ func Test_edit_LEFT_RIGHT() endfunc func Test_edit_MOUSE() - " This is a simple test, since we not really using the mouse here + " This is a simple test, since we're not really using the mouse here CheckFeature mouse 10new call setline(1, range(1, 100)) @@ -1797,7 +1797,7 @@ func Test_edit_charconvert() close! set charconvert& - " 'charconvert' function doesn't create a output file + " 'charconvert' function doesn't create an output file func Cconv1() endfunc set charconvert=Cconv1() diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -2911,7 +2911,7 @@ func Test_state() call term_sendkeys(buf, getstate) call WaitForAssert({-> assert_match('state: mSc; mode: n', term_getline(buf, 6))}, 1000) - " A operator is pending + " An operator is pending call term_sendkeys(buf, ":call RunTimer()\y") call TermWait(buf, 25) call term_sendkeys(buf, "y") diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim --- a/src/testdir/test_highlight.vim +++ b/src/testdir/test_highlight.vim @@ -878,7 +878,7 @@ func Test_highlight_default() hi clear endfunc -" Test for 'ctermul in a highlight group +" Test for 'ctermul' in a highlight group func Test_highlight_ctermul() CheckNotGui call assert_notmatch('ctermul=', HighlightArgs('Normal')) diff --git a/src/testdir/test_listdict.vim b/src/testdir/test_listdict.vim --- a/src/testdir/test_listdict.vim +++ b/src/testdir/test_listdict.vim @@ -373,7 +373,7 @@ func Test_dict_big() endtry call assert_equal('Vim(let):E716: "1500"', str) - " lookup each items + " lookup each item for i in range(1500) call assert_equal(3000 - i, d[i]) endfor diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim --- a/src/testdir/test_mksession.vim +++ b/src/testdir/test_mksession.vim @@ -568,7 +568,7 @@ endfunc func Test_mkview_terminal_windows() CheckFeature terminal - " create two window on the same terminal to check this is handled OK + " create two windows on the same terminal to check this is handled OK terminal let term_buf = bufnr() exe 'sbuf ' .. term_buf diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim --- a/src/testdir/test_normal.vim +++ b/src/testdir/test_normal.vim @@ -380,7 +380,7 @@ func Test_normal06_formatprg() endfunc func Test_normal07_internalfmt() - " basic test for internal formmatter to textwidth of 12 + " basic test for internal formatter to textwidth of 12 let list=range(1,11) call map(list, 'v:val." "') 10new @@ -2582,7 +2582,7 @@ func Test_normal33_g_cmd2() exe "norm! G0\4k4ly" exe "norm! gvood" call assert_equal(['', 'abfgh', 'abfgh', 'abfgh', 'fgh', 'fgh', 'fgh', 'fgh', 'fgh'], getline(1,'$')) - " gv cannot be used in operator pending mode + " gv cannot be used in operator pending mode call assert_beeps('normal! cgv') " gv should beep without a previously selected visual area new diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim --- a/src/testdir/test_substitute.vim +++ b/src/testdir/test_substitute.vim @@ -1448,7 +1448,7 @@ func Test_substitute_expr_switch_win() let bufnr = bufnr('%') put ="abcdef" silent! s/\%')/\=R() - call assert_fails(':%s/./\=R()/g', 'E565') + call assert_fails(':%s/./\=R()/g', 'E565:') delfunc R exe bufnr .. "bw!" endfunc diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim --- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -1884,7 +1884,7 @@ def Test_class_implements_interface() enddef endclass END - v9.CheckScriptFailure(lines, 'E1407: Member "IsEven": type mismatch, expected func(number): bool but got func(number): string') + v9.CheckScriptFailure(lines, 'E1407: Method "IsEven": type mismatch, expected func(number): bool but got func(number): string') lines =<< trim END vim9script @@ -1897,7 +1897,7 @@ def Test_class_implements_interface() enddef endclass END - v9.CheckScriptFailure(lines, 'E1407: Member "IsEven": type mismatch, expected func(number): bool but got func(bool): bool') + v9.CheckScriptFailure(lines, 'E1407: Method "IsEven": type mismatch, expected func(number): bool but got func(bool): bool') lines =<< trim END vim9script @@ -1910,7 +1910,7 @@ def Test_class_implements_interface() enddef endclass END - v9.CheckScriptFailure(lines, 'E1407: Member "IsEven": type mismatch, expected func(number): bool but got func(number, ...list): bool') + v9.CheckScriptFailure(lines, 'E1407: Method "IsEven": type mismatch, expected func(number): bool but got func(number, ...list): bool') # access superclass interface members from subclass, mix variable order lines =<< trim END @@ -4576,7 +4576,7 @@ def Test_abstract_method() enddef endclass END - v9.CheckScriptFailure(lines, 'E1407: Member "Foo": type mismatch, expected func(string, number): list but got func(number, string): list') + v9.CheckScriptFailure(lines, 'E1407: Method "Foo": type mismatch, expected func(string, number): list but got func(number, string): list') # Use an abstract class to invoke an abstract method # FIXME: This should fail diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim --- a/src/testdir/test_vimscript.vim +++ b/src/testdir/test_vimscript.vim @@ -3105,7 +3105,7 @@ endfunc " should be given. " " This test reuses the function MESSAGES() from the previous test. -" This functions checks the messages in g:msgfile. +" This function checks the messages in g:msgfile. "------------------------------------------------------------------------------- func Test_nested_while_error() @@ -3230,7 +3230,7 @@ endfunc " error messages should be given. " " This test reuses the function MESSAGES() from the previous test. -" This functions checks the messages in g:msgfile. +" This function checks the messages in g:msgfile. "------------------------------------------------------------------------------- func Test_nested_cont_break_error() @@ -3336,7 +3336,7 @@ endfunc " should be given. " " This test reuses the function MESSAGES() from the previous test. -" This functions checks the messages in g:msgfile. +" This function check the messages in g:msgfile. "------------------------------------------------------------------------------- func Test_nested_endtry_error() diff --git a/src/testdir/test_virtualedit.vim b/src/testdir/test_virtualedit.vim --- a/src/testdir/test_virtualedit.vim +++ b/src/testdir/test_virtualedit.vim @@ -236,7 +236,7 @@ func Test_ve_completion() set virtualedit= endfunc -" Using "C" then then moves the last remaining character to the next +" Using "C" then moves the last remaining character to the next " line. (Mary Ellen Foster) func Test_ve_del_to_eol() new diff --git a/src/typval.c b/src/typval.c --- a/src/typval.c +++ b/src/typval.c @@ -292,7 +292,7 @@ tv_get_number(typval_T *varp) } /* - * Like tv_get_numbe() but in Vim9 script do convert a number in a string to a + * Like tv_get_number() but in Vim9 script do convert a number in a string to a * number without giving an error. */ varnumber_T diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1886, +/**/ 1885, /**/ 1884, diff --git a/src/vim9.h b/src/vim9.h --- a/src/vim9.h +++ b/src/vim9.h @@ -32,7 +32,7 @@ typedef enum { ISN_SOURCE, // source autoload script, isn_arg.number is the script ID ISN_INSTR, // instructions compiled from expression - ISN_CONSTRUCT, // construct an object, using contstruct_T + ISN_CONSTRUCT, // construct an object, using construct_T ISN_GET_OBJ_MEMBER, // object member, index is isn_arg.number ISN_GET_ITF_MEMBER, // interface member, index is isn_arg.classmember ISN_STORE_THIS, // store value in "this" object member, index is diff --git a/src/vim9type.c b/src/vim9type.c --- a/src/vim9type.c +++ b/src/vim9type.c @@ -722,7 +722,7 @@ check_typval_type(type_T *expected, typv { // If a type check is needed that means assigning "any" or // "unknown" to a more specific type, which fails here. - // Execpt when it looks like a lambda, since they have an + // Except when it looks like a lambda, since they have an // incomplete type. type_mismatch_where(expected, actual_type, where); res = FAIL;