From 0e46e761fc2ea39915e55719d56bfe47a0985c12 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 15 Sep 2025 19:42:30 +0000 Subject: [PATCH] Fix some typos in documentation, C code and test files closes: #18300 Signed-off-by: zeertzjq Signed-off-by: Christian Brabandt --- runtime/doc/diff.txt | 4 ++-- runtime/doc/helphelp.txt | 6 +++--- runtime/doc/options.txt | 2 +- runtime/doc/terminal.txt | 4 ++-- runtime/doc/wayland.txt | 4 ++-- src/insexpand.c | 2 +- src/os_unix.c | 10 +++++----- src/tabpanel.c | 2 +- src/term.c | 2 +- src/testdir/test_ins_complete.vim | 4 ++-- src/testdir/test_vim9_class.vim | 2 +- src/testdir/test_wayland.vim | 4 ++-- src/testdir/test_xxd.vim | 2 +- src/wayland.c | 6 +++--- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 150e8745fd..8a9a41e48e 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 9.1. Last change: 2025 Aug 06 +*diff.txt* For Vim version 9.1. Last change: 2025 Sep 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -351,7 +351,7 @@ hard to see what the actual edit on it was. You can use diff anchors to pin that function so the diff algorithm will align based on it. To use it, set anchors using 'diffanchors' which is a comma-separated list of -{address} in each file, and then add "anchor" to 'diffopt'. Internaly, Vim +{address} in each file, and then add "anchor" to 'diffopt'. Internally, Vim splits each file up into sections split by the anchors. It performs the diff on each pair of sections separately before merging the results back. diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt index 967078135f..ef70be7709 100644 --- a/runtime/doc/helphelp.txt +++ b/runtime/doc/helphelp.txt @@ -1,4 +1,4 @@ -*helphelp.txt* For Vim version 9.1. Last change: 2025 Aug 06 +*helphelp.txt* For Vim version 9.1. Last change: 2025 Sep 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -392,8 +392,8 @@ help file it's best to copy one of the existing files and use it as a template. Vim help files generally use 2 spaces after a sentence (since they are written -using a fixed-width font and that was the prefered style in the 70s/80s), like -what is described here: https://english.stackexchange.com/a/2602 +using a fixed-width font and that was the preferred style in the 70s/80s), +like what is described here: https://english.stackexchange.com/a/2602 The first line in a help file should have the following format: diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 961f9c51ac..9643dd86ad 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -3044,7 +3044,7 @@ A jump table for the options with a short description can be found at |Q_op|. Each anchor line splits the buffer (the split happens above the anchor), with each part being diff'ed separately before the final result is joined. When more than one {address} are provided, the - anchors will be sorted interally by line number. If using buffer + anchors will be sorted internally by line number. If using buffer local options, each buffer should have the same number of anchors (extra anchors will be ignored). This option is only used when 'diffopt' has "anchor" set. See |diff-anchors| for more details and diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt index c25e265970..b667832f05 100644 --- a/runtime/doc/terminal.txt +++ b/runtime/doc/terminal.txt @@ -1,4 +1,4 @@ -*terminal.txt* For Vim version 9.1. Last change: 2025 Sep 14 +*terminal.txt* For Vim version 9.1. Last change: 2025 Sep 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1428,7 +1428,7 @@ gdb: set a temporary breakpoint at the specified position *:Clear* delete the breakpoint at the cursor position *:ToggleBreak* set a breakpoint at the cursor position or delete all - breakpoints at the cursor positoin + breakpoints at the cursor position *:Step* execute the gdb "step" command *:Over* execute the gdb "next" command (`:Next` is a Vim command) diff --git a/runtime/doc/wayland.txt b/runtime/doc/wayland.txt index ef70f67c40..adb7e694fa 100644 --- a/runtime/doc/wayland.txt +++ b/runtime/doc/wayland.txt @@ -1,4 +1,4 @@ -*wayland.txt* For Vim version 9.1. Last change: 2025 Sep 02 +*wayland.txt* For Vim version 9.1. Last change: 2025 Sep 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -56,7 +56,7 @@ protocols, for accessing the current Wayland selection. These are the best case scenario protocols, see |wayland-focus-steal|. Selection in this case essentially means the "clipboard." You can check if your Wayland compositor supports either of these protocols by running the wayland-info command, which -should be bunded with libwayland on your system: > +should be bundled with libwayland on your system: > wayland-info | grep -E '(ext_data_control|zwlr_data_control)' b_p_cpt_cb, curbuf->b_p_cpt_count) != OK) diff --git a/src/os_unix.c b/src/os_unix.c index 47c24b107c..b2bd8adb30 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -9546,7 +9546,7 @@ socket_server_send( char_u *str, // What to send char_u **result, // Set to result of expr char_u **receiver, // Full path of "name" - int is_expr, // Is it an expresison or keystrokes? + int is_expr, // Is it an expression or keystrokes? int timeout, // In milliseconds int silent) // Don't complain if socket doesn't exist { @@ -9628,7 +9628,7 @@ socket_server_send( else vim_free(path); - // Exit, we aren't waiting for a reponse + // Exit, we aren't waiting for a response return 0; } @@ -9935,7 +9935,7 @@ socket_server_init_cmd(ss_cmd_T *cmd, ss_cmd_type_T type) /* * Append a message to a command. Note that "len" is the length of contents. - * Returns OK on sucess and FAIL on failure + * Returns OK on success and FAIL on failure */ static int socket_server_append_msg(ss_cmd_T *cmd, char_u type, char_u *contents, int len) @@ -10386,7 +10386,7 @@ socket_server_exec_cmd(ss_cmd_T *cmd, int fd) STRLEN(result) + 1); // We add +1 in case "result" // is an empty string. else - // An error occured, return an error msg instead + // An error occurred, return an error msg instead socket_server_append_msg(&rcmd, SS_MSG_TYPE_STRING, (char_u *)_(e_invalid_expression_received), STRLEN(e_invalid_expression_received)); @@ -10563,7 +10563,7 @@ socket_server_dispatch(int timeout) } /* - * Check if socket "name" is reponsive by sending an ALIVE command. This does + * Check if socket "name" is responsive by sending an ALIVE command. This does * not require the socket server to be active. */ static int diff --git a/src/tabpanel.c b/src/tabpanel.c index 1fc3ca1217..f393fafca2 100644 --- a/src/tabpanel.c +++ b/src/tabpanel.c @@ -150,7 +150,7 @@ draw_tabpanel(void) if (maxwidth == 0) return; - // Reset got_int to avoid build_stl_str_hl() isn't evaluted. + // Reset got_int to avoid build_stl_str_hl() isn't evaluated. got_int = FALSE; if (tpl_is_vert) diff --git a/src/term.c b/src/term.c index ce0d24caa5..e230858373 100644 --- a/src/term.c +++ b/src/term.c @@ -5911,7 +5911,7 @@ handle_osc(char_u *tp, int len, char_u *key_name, int *slen) LOG_TRN("Received OSC response: %s", (char*)tp); // Check if it is a valid OSC sequence, and consume it. OSC format // consists of: - // + // // is either ] or an OSC character // can be '\007', \ or STERM. cur = 1 + (tp[0] == ESC); diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim index 559ffbe8b1..e2b45b9966 100644 --- a/src/testdir/test_ins_complete.vim +++ b/src/testdir/test_ins_complete.vim @@ -5023,7 +5023,7 @@ func Test_nonkeyword_trigger() call assert_equal('a#', getline('.')) set completeopt& - " Test 2: Filter nonkeyword and keyword matches with differet startpos + " Test 2: Filter nonkeyword and keyword matches with different startpos set completeopt+=menuone,noselect call feedkeys("S#a\b\\\0", 'tx!') call assert_equal(['abc', 'abcd', '#abar'], b:matches->mapnew('v:val.word')) @@ -5144,7 +5144,7 @@ func Test_autocomplete_trigger() call assert_equal(2, g:CallCount) call assert_equal('a#', getline('.')) - " Test 2: Filter nonkeyword and keyword matches with differet startpos + " Test 2: Filter nonkeyword and keyword matches with different startpos for fuzzy in range(2) if fuzzy set completeopt+=fuzzy diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim index 7e0a5100b0..fc38898317 100644 --- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -12518,7 +12518,7 @@ def Test_super_keyword() END v9.CheckSourceFailure(lines, 'E1326: Variable "foo" not found in object "B"') - # Using super to access an overriden method in the parent class + # Using super to access an overridden method in the parent class lines =<< trim END vim9script diff --git a/src/testdir/test_wayland.vim b/src/testdir/test_wayland.vim index 4b0fcd78ca..8185749642 100644 --- a/src/testdir/test_wayland.vim +++ b/src/testdir/test_wayland.vim @@ -137,7 +137,7 @@ func Test_wayland_wlrestore() call assert_equal('2', getreg('+')) - " Check if wlrestore doesn't disconnect the display if not nessecary by seeing + " Check if wlrestore doesn't disconnect the display if not necessary by seeing " if Vim doesn't lose the selection call setreg('+', 'testing', 'c') @@ -209,7 +209,7 @@ func Test_wayland_paste() bw! - " Check behaviour when selecton is cleared (empty) + " Check behaviour when selection is cleared (empty) call system('wl-copy --clear') call assert_fails('put +', 'E353:') endfunc diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim index b98988157b..030fdde5b5 100644 --- a/src/testdir/test_xxd.vim +++ b/src/testdir/test_xxd.vim @@ -702,7 +702,7 @@ func Test_xxd_overflow() bw! endfunc -" this caused a NULL derefence +" this caused a NULL dereference func Test_xxd_null_dereference() CheckUnix CheckExecutable /bin/true diff --git a/src/wayland.c b/src/wayland.c index e1eee19940..0506828947 100644 --- a/src/wayland.c +++ b/src/wayland.c @@ -30,7 +30,7 @@ typedef struct { struct wl_seat *proxy; char *label; // Name of seat as text (e.g. seat0, // seat1...). - uint32_t capabilities; // Bitmask of the capabilites of the seat + uint32_t capabilities; // Bitmask of the capabilities of the seat // (pointer, keyboard, touch). } vwl_seat_T; @@ -618,7 +618,7 @@ vwl_log_handler(const char *fmt, va_list args) /* * Connect to the display with name; passing NULL will use libwayland's way of * getting the display. Additionally get the registry object but will not - * starting listening. Returns OK on sucess and FAIL on failure. + * starting listening. Returns OK on success and FAIL on failure. */ static int vwl_connect_display(const char *display) @@ -2275,7 +2275,7 @@ wayland_cb_own_selection( // better to do it this way. Additionally other Wayland applications // seem to set the selection every time. // - // There should be no noticable performance change since its not + // There should be no noticeable performance change since its not // like this is running in the background constantly in Vim, only // runs once when the user yanks text to the system clipboard. vwl_data_source_destroy(&clip_sel->source, FALSE);