mirror of
				https://github.com/vim/vim.git
				synced 2025-10-30 09:47:20 -04:00 
			
		
		
		
	Fix some typos in documentation, C code and test files
closes: #18300 Signed-off-by: zeertzjq <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
		
				
					committed by
					
						 Christian Brabandt
						Christian Brabandt
					
				
			
			
				
	
			
			
			
						parent
						
							817e4d3ee6
						
					
				
				
					commit
					0e46e761fc
				
			| @@ -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 | 		  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. | 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 | 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 | 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. | on each pair of sections separately before merging the results back. | ||||||
|  |  | ||||||
|   | |||||||
| @@ -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 | 		  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. | template. | ||||||
|  |  | ||||||
| Vim help files generally use 2 spaces after a sentence (since they are written | 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 | using a fixed-width font and that was the preferred style in the 70s/80s), | ||||||
| what is described here: https://english.stackexchange.com/a/2602 | like what is described here: https://english.stackexchange.com/a/2602 | ||||||
|  |  | ||||||
| The first line in a help file should have the following format: | The first line in a help file should have the following format: | ||||||
|  |  | ||||||
|   | |||||||
| @@ -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 | 	Each anchor line splits the buffer (the split happens above the | ||||||
| 	anchor), with each part being diff'ed separately before the final | 	anchor), with each part being diff'ed separately before the final | ||||||
| 	result is joined.  When more than one {address} are provided, the | 	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 | 	local options, each buffer should have the same number of anchors | ||||||
| 	(extra anchors will be ignored).  This option is only used when | 	(extra anchors will be ignored).  This option is only used when | ||||||
| 	'diffopt' has "anchor" set.  See |diff-anchors| for more details and | 	'diffopt' has "anchor" set.  See |diff-anchors| for more details and | ||||||
|   | |||||||
| @@ -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 | 		  VIM REFERENCE MANUAL	  by Bram Moolenaar | ||||||
| @@ -1428,7 +1428,7 @@ gdb: | |||||||
| 		set a temporary breakpoint at the specified position | 		set a temporary breakpoint at the specified position | ||||||
|  *:Clear*	delete the breakpoint at the cursor position |  *:Clear*	delete the breakpoint at the cursor position | ||||||
|  *:ToggleBreak*	set a breakpoint at the cursor position or delete all |  *: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 |  *:Step*	execute the gdb "step" command | ||||||
|  *:Over*	execute the gdb "next" command (`:Next` is a Vim command) |  *:Over*	execute the gdb "next" command (`:Next` is a Vim command) | ||||||
|   | |||||||
| @@ -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 | 		  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 | case scenario protocols, see |wayland-focus-steal|.  Selection in this case | ||||||
| essentially means the "clipboard."  You can check if your Wayland compositor | essentially means the "clipboard."  You can check if your Wayland compositor | ||||||
| supports either of these protocols by running the wayland-info command, which | 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)' | 	wayland-info | grep -E '(ext_data_control|zwlr_data_control)' | ||||||
| <If grep finds a match, then you have either or both protocols on your system. | <If grep finds a match, then you have either or both protocols on your system. | ||||||
| If you don't get any match, then please see |wayland-focus-steal| for more | If you don't get any match, then please see |wayland-focus-steal| for more | ||||||
|   | |||||||
| @@ -3451,7 +3451,7 @@ set_cpt_callbacks(optset_T *args) | |||||||
| 	} | 	} | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     if (!local) // ':set' used insted of ':setlocal' |     if (!local) // ':set' used instead of ':setlocal' | ||||||
| 	// Cache the callback array | 	// Cache the callback array | ||||||
| 	if (copy_cpt_callbacks(&cpt_cb, &cpt_cb_count, curbuf->b_p_cpt_cb, | 	if (copy_cpt_callbacks(&cpt_cb, &cpt_cb_count, curbuf->b_p_cpt_cb, | ||||||
| 		    curbuf->b_p_cpt_count) != OK) | 		    curbuf->b_p_cpt_count) != OK) | ||||||
|   | |||||||
| @@ -9546,7 +9546,7 @@ socket_server_send( | |||||||
| 	char_u *str,	    // What to send | 	char_u *str,	    // What to send | ||||||
| 	char_u **result,    // Set to result of expr | 	char_u **result,    // Set to result of expr | ||||||
| 	char_u **receiver,  // Full path of "name" | 	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 timeout,	    // In milliseconds | ||||||
| 	int silent)	    // Don't complain if socket doesn't exist | 	int silent)	    // Don't complain if socket doesn't exist | ||||||
| { | { | ||||||
| @@ -9628,7 +9628,7 @@ socket_server_send( | |||||||
| 	else | 	else | ||||||
| 	    vim_free(path); | 	    vim_free(path); | ||||||
|  |  | ||||||
| 	// Exit, we aren't waiting for a reponse | 	// Exit, we aren't waiting for a response | ||||||
| 	return 0; | 	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. |  * 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 |     static int | ||||||
| socket_server_append_msg(ss_cmd_T *cmd, char_u type, char_u *contents, int len) | 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" | 			    STRLEN(result) + 1); // We add +1 in case "result" | ||||||
| 						 // is an empty string. | 						 // is an empty string. | ||||||
| 		else | 		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, | 		    socket_server_append_msg(&rcmd, SS_MSG_TYPE_STRING, | ||||||
| 			    (char_u *)_(e_invalid_expression_received), | 			    (char_u *)_(e_invalid_expression_received), | ||||||
| 			    STRLEN(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. |  * not require the socket server to be active. | ||||||
|  */ |  */ | ||||||
|     static int |     static int | ||||||
|   | |||||||
| @@ -150,7 +150,7 @@ draw_tabpanel(void) | |||||||
|     if (maxwidth == 0) |     if (maxwidth == 0) | ||||||
| 	return; | 	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; |     got_int = FALSE; | ||||||
|  |  | ||||||
|     if (tpl_is_vert) |     if (tpl_is_vert) | ||||||
|   | |||||||
| @@ -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); | 	LOG_TRN("Received OSC response: %s", (char*)tp); | ||||||
| 	// Check if it is a valid OSC sequence, and consume it. OSC format | 	// Check if it is a valid OSC sequence, and consume it. OSC format | ||||||
| 	// consists of: | 	// consists of: | ||||||
| 	// <idenfitifer><data><terminator> | 	// <identifier><data><terminator> | ||||||
| 	// <identifier> is either <Esc>] or an OSC character | 	// <identifier> is either <Esc>] or an OSC character | ||||||
| 	// <terminator> can be '\007', <Esc>\ or STERM. | 	// <terminator> can be '\007', <Esc>\ or STERM. | ||||||
| 	cur = 1 + (tp[0] == ESC); | 	cur = 1 + (tp[0] == ESC); | ||||||
|   | |||||||
| @@ -5023,7 +5023,7 @@ func Test_nonkeyword_trigger() | |||||||
|   call assert_equal('a#', getline('.')) |   call assert_equal('a#', getline('.')) | ||||||
|   set completeopt& |   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 |   set completeopt+=menuone,noselect | ||||||
|   call feedkeys("S#a\<C-N>b\<F2>\<F3>\<Esc>0", 'tx!') |   call feedkeys("S#a\<C-N>b\<F2>\<F3>\<Esc>0", 'tx!') | ||||||
|   call assert_equal(['abc', 'abcd', '#abar'], b:matches->mapnew('v:val.word')) |   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(2, g:CallCount) | ||||||
|   call assert_equal('a#', getline('.')) |   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) |   for fuzzy in range(2) | ||||||
|     if fuzzy |     if fuzzy | ||||||
|       set completeopt+=fuzzy |       set completeopt+=fuzzy | ||||||
|   | |||||||
| @@ -12518,7 +12518,7 @@ def Test_super_keyword() | |||||||
|   END |   END | ||||||
|   v9.CheckSourceFailure(lines, 'E1326: Variable "foo" not found in object "B"') |   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 |   lines =<< trim END | ||||||
|     vim9script |     vim9script | ||||||
|  |  | ||||||
|   | |||||||
| @@ -137,7 +137,7 @@ func Test_wayland_wlrestore() | |||||||
|  |  | ||||||
|   call assert_equal('2', getreg('+')) |   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 |   " if Vim doesn't lose the selection | ||||||
|   call setreg('+', 'testing', 'c') |   call setreg('+', 'testing', 'c') | ||||||
|  |  | ||||||
| @@ -209,7 +209,7 @@ func Test_wayland_paste() | |||||||
|  |  | ||||||
|   bw! |   bw! | ||||||
|  |  | ||||||
|   " Check behaviour when selecton is cleared (empty) |   " Check behaviour when selection is cleared (empty) | ||||||
|   call system('wl-copy --clear') |   call system('wl-copy --clear') | ||||||
|   call assert_fails('put +', 'E353:') |   call assert_fails('put +', 'E353:') | ||||||
| endfunc | endfunc | ||||||
|   | |||||||
| @@ -702,7 +702,7 @@ func Test_xxd_overflow() | |||||||
|   bw! |   bw! | ||||||
| endfunc | endfunc | ||||||
|  |  | ||||||
| " this caused a NULL derefence | " this caused a NULL dereference | ||||||
| func Test_xxd_null_dereference() | func Test_xxd_null_dereference() | ||||||
|   CheckUnix |   CheckUnix | ||||||
|   CheckExecutable /bin/true |   CheckExecutable /bin/true | ||||||
|   | |||||||
| @@ -30,7 +30,7 @@ typedef struct { | |||||||
|     struct wl_seat  *proxy; |     struct wl_seat  *proxy; | ||||||
|     char	    *label;	    // Name of seat as text (e.g. seat0, |     char	    *label;	    // Name of seat as text (e.g. seat0, | ||||||
| 				    // seat1...). | 				    // seat1...). | ||||||
|     uint32_t	    capabilities;   // Bitmask of the capabilites of the seat |     uint32_t	    capabilities;   // Bitmask of the capabilities of the seat | ||||||
| 				    // (pointer, keyboard, touch). | 				    // (pointer, keyboard, touch). | ||||||
| } vwl_seat_T; | } 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 |  * 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 |  * 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 |     static int | ||||||
| vwl_connect_display(const char *display) | vwl_connect_display(const char *display) | ||||||
| @@ -2275,7 +2275,7 @@ wayland_cb_own_selection( | |||||||
| 	    // better to do it this way. Additionally other Wayland applications | 	    // better to do it this way. Additionally other Wayland applications | ||||||
| 	    // seem to set the selection every time. | 	    // 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 | 	    // like this is running in the background constantly in Vim, only | ||||||
| 	    // runs once when the user yanks text to the system clipboard. | 	    // runs once when the user yanks text to the system clipboard. | ||||||
| 	    vwl_data_source_destroy(&clip_sel->source, FALSE); | 	    vwl_data_source_destroy(&clip_sel->source, FALSE); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user