Skip to content

Commit ee17b6f

Browse files
committed
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 <[email protected]> Co-authored-by: zeertzjq <[email protected]> Co-authored-by: Viktor Szépe <[email protected]> Co-authored-by: nuid64 <[email protected]> Co-authored-by: Meng Xiangzhuo <[email protected]> Co-authored-by: Dominique Pellé <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent 7bcd25c commit ee17b6f

33 files changed

Lines changed: 48 additions & 46 deletions

runtime/doc/builtin.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2207,7 +2207,7 @@ environ() *environ()*
22072207
22082208
err_teapot([{expr}]) *err_teapot()*
22092209
Produce an error with number 418, needed for implementation of
2210-
RFC 2325.
2210+
RFC 2324.
22112211
If {expr} is present and it is TRUE error 503 is given,
22122212
indicating that coffee is temporarily not available.
22132213
If {expr} is present it must be a String.
@@ -6786,7 +6786,7 @@ printf({fmt}, {expr1} ...) *printf()*
67866786
*printf-$*
67876787
In certain languages, error and informative messages are
67886788
more readable when the order of words is different from the
6789-
corresponding message in English. To accomodate translations
6789+
corresponding message in English. To accommodate translations
67906790
having a different word order, positional arguments may be
67916791
used to indicate this. For instance: >
67926792

runtime/doc/insert.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ CTRL-R {register} *i_CTRL-R*
127127
'/' the last search pattern
128128
':' the last command-line
129129
'.' the last inserted text
130-
*i_CTRL-R_-*
130+
*i_CTRL-R_-*
131131
'-' the last small (less than a line) delete
132132
register. This is repeatable using |.| since
133133
it remembers the register to put instead of

runtime/doc/windows.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ CTRL-W v *CTRL-W_v*
189189
it doesn't!
190190

191191
CTRL-W n *CTRL-W_n*
192-
CTRL-W CTRL_N *CTRL-W_CTRL-N*
192+
CTRL-W CTRL-N *CTRL-W_CTRL-N*
193193
:[N]new [++opt] [+cmd] *:new*
194194
Create a new window and start editing an empty file in it.
195195
Make new window N high (default is to use half the existing

runtime/ftplugin/zig.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ endif
3939

4040
let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)'
4141

42-
" Safety check: don't execute zip from current directory
42+
" Safety check: don't execute zig from current directory
4343
if !exists('g:zig_std_dir') && exists('*json_decode') &&
4444
\ executable('zig') && get(g:, 'zig_exec', get(g:, 'plugin_exec', 0))
4545
\ && (fnamemodify(exepath("zig"), ":p:h") != s:tmp_cwd

src/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ CClink = $(CC)
345345
# --enable-gui=gtk or leave out --enable-gnome-check.
346346
#
347347
# GNOME makes sense only for GTK+ 2. Avoid use of --enable-gnome-check with
348-
# GTK+ 3 build, as the functionality of GNOME is already incooperated into
348+
# GTK+ 3 build, as the functionality of GNOME is already incorporated into
349349
# GTK+ 3.
350350
#
351351
# If the selected GUI isn't found, the GUI is disabled automatically

src/errors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3516,7 +3516,7 @@ EXTERN char e_invalid_format_specifier_str[]
35163516
EXTERN char e_member_str_type_mismatch_expected_str_but_got_str[]
35173517
INIT(= N_("E1406: Member \"%s\": type mismatch, expected %s but got %s"));
35183518
EXTERN char e_method_str_type_mismatch_expected_str_but_got_str[]
3519-
INIT(= N_("E1407: Member \"%s\": type mismatch, expected %s but got %s"));
3519+
INIT(= N_("E1407: Method \"%s\": type mismatch, expected %s but got %s"));
35203520
EXTERN char e_aptypes_is_null_nr_str[]
35213521
INIT(= "E1408: Internal error: ap_types or ap_types[idx] is NULL: %d: %s");
35223522
EXTERN char e_interface_static_direct_access_str[]

src/ex_cmds.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2647,9 +2647,9 @@ do_ecmd(
26472647
}
26482648

26492649

2650-
// End Visual mode before switching to another buffer, so the text can be
2651-
// copied into the GUI selection buffer.
2652-
// Careful: may trigger ModeChanged() autocommand
2650+
// End Visual mode before switching to another buffer, so the text can be
2651+
// copied into the GUI selection buffer.
2652+
// Careful: may trigger ModeChanged() autocommand
26532653

26542654
// Should we block autocommands here?
26552655
reset_VIsual();

src/findfile.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
*
4949
* ATTENTION:
5050
* ==========
51-
* Also we use an allocated search context here, this functions are NOT
52-
* thread-safe!!!!!
51+
* Also we use an allocated search context here, these functions are NOT
52+
* thread-safe!
5353
*
5454
* To minimize parameter passing (or because I'm to lazy), only the
5555
* external visible functions get a search context as a parameter. This is

src/gui_gtk_x11.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4002,8 +4002,8 @@ gui_mch_init(void)
40024002
}
40034003

40044004
// Real windows can get focus ... GtkPlug, being a mere container can't,
4005-
// only its widgets. Arguably, this could be common code and we not use
4006-
// the window focus at all, but let's be safe.
4005+
// only its widgets. Arguably, this could be common code and we do not
4006+
// use the window focus at all, but let's be safe.
40074007
if (gtk_socket_id == 0)
40084008
{
40094009
g_signal_connect(G_OBJECT(gui.mainwin), "focus-out-event",

src/insexpand.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3789,7 +3789,7 @@ ins_compl_get_exp(pos_T *ini)
37893789
st.found_all = FALSE;
37903790
st.ins_buf = curbuf;
37913791
vim_free(st.e_cpt_copy);
3792-
// Make a copy of 'complete', if case the buffer is wiped out.
3792+
// Make a copy of 'complete', in case the buffer is wiped out.
37933793
st.e_cpt_copy = vim_strsave((compl_cont_status & CONT_LOCAL)
37943794
? (char_u *)"." : curbuf->b_p_cpt);
37953795
st.e_cpt = st.e_cpt_copy == NULL ? (char_u *)"" : st.e_cpt_copy;

0 commit comments

Comments
 (0)