# HG changeset patch # User Christian Brabandt # Date 1692855207 -7200 # Node ID d46f974fd69e7af257cbeb9ac3e77b677e134686 # Parent 3c2cb52444e92f11ca042b8f1c8113e5681a7c1e runtime: Fix typos in various files Commit: https://github.com/vim/vim/commit/3fc7a7e44abda6505ccd39a6d067db6e5173cbf6 Author: Viktor Sz?pe Date: Wed Aug 23 21:20:00 2023 +0200 runtime: Fix typos in various files closes: https://github.com/vim/vim/issues/12836 Signed-off-by: Christian Brabandt Co-authored-by: Viktor Sz?pe diff --git a/runtime/ftplugin/debchangelog.vim b/runtime/ftplugin/debchangelog.vim --- a/runtime/ftplugin/debchangelog.vim +++ b/runtime/ftplugin/debchangelog.vim @@ -122,7 +122,7 @@ function NewVersion() normal! 1G0 call search(')') normal! h - " ':normal' doens't support key annotation () directly. + " ':normal' doesn't support key annotation () directly. " Vim's manual recommends using ':exe' to use key annotation indirectly (backslash-escaping needed though). exe "normal! \" call setline(1, substitute(getline(1), '-\$\$', '-', '')) diff --git a/runtime/ftplugin/readline.vim b/runtime/ftplugin/readline.vim --- a/runtime/ftplugin/readline.vim +++ b/runtime/ftplugin/readline.vim @@ -25,7 +25,7 @@ if exists("loaded_matchit") && !exists(" endif if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") - let b:browsefilter = "Readline Intialization Files (inputrc .inputrc)\tinputrc;*.inputrc\n" .. + let b:browsefilter = "Readline Initialization Files (inputrc .inputrc)\tinputrc;*.inputrc\n" .. \ "All Files (*.*)\t*.*\n" let b:undo_ftplugin ..= " | unlet! b:browsefilter" endif diff --git a/runtime/ftplugin/rst.vim b/runtime/ftplugin/rst.vim --- a/runtime/ftplugin/rst.vim +++ b/runtime/ftplugin/rst.vim @@ -28,7 +28,7 @@ setlocal formatoptions+=tcroql " directives (..) and ordered lists (1.), although it can cause problems for " many other cases. " -" More sophisticated indentation rules should be revisted in the future. +" More sophisticated indentation rules should be revisited in the future. if exists("g:rst_style") && g:rst_style != 0 setlocal expandtab shiftwidth=3 softtabstop=3 tabstop=8 diff --git a/runtime/ftplugin/sql.vim b/runtime/ftplugin/sql.vim --- a/runtime/ftplugin/sql.vim +++ b/runtime/ftplugin/sql.vim @@ -140,7 +140,7 @@ if !exists("*SQL_SetType") \ ) " Remove duplicates, since sqlanywhere.vim can exist in the - " sytax, indent and ftplugin directory, yet we only want + " syntax, indent and ftplugin directory, yet we only want " to display the option once let index = match(sqls, '.\{-}\ze\n') while index > -1 @@ -204,7 +204,7 @@ if !exists("*SQL_SetType") endif let b:sql_type_override = new_sql_type - " Remove any cached SQL since a new sytax will have different + " Remove any cached SQL since a new syntax will have different " items and groups if !exists('g:loaded_sql_completion') || g:loaded_sql_completion >= 100 call sqlcomplete#ResetCacheSyntax() diff --git a/runtime/ftplugin/tidy.vim b/runtime/ftplugin/tidy.vim --- a/runtime/ftplugin/tidy.vim +++ b/runtime/ftplugin/tidy.vim @@ -1,5 +1,5 @@ " Vim filetype plugin file -" Language: HMTL Tidy Configuration +" Language: HTML Tidy Configuration " Maintainer: Doug Kearns " Last Change: 2020 Sep 4 diff --git a/runtime/ftplugin/zig.vim b/runtime/ftplugin/zig.vim --- a/runtime/ftplugin/zig.vim +++ b/runtime/ftplugin/zig.vim @@ -17,7 +17,7 @@ compiler zig_build " Match Zig builtin fns setlocal iskeyword+=@-@ -" Recomended code style, no tabs and 4-space indentation +" Recommended code style, no tabs and 4-space indentation setlocal expandtab setlocal tabstop=8 setlocal softtabstop=4 diff --git a/runtime/indent/nsis.vim b/runtime/indent/nsis.vim --- a/runtime/indent/nsis.vim +++ b/runtime/indent/nsis.vim @@ -15,7 +15,7 @@ setlocal nosmartindent setlocal noautoindent setlocal indentexpr=GetNsisIndent(v:lnum) setlocal indentkeys=!^F,o,O -setlocal indentkeys+==~${Else,=~${EndIf,=~${EndUnless,=~${AndIf,=~${AndUnless,=~${OrIf,=~${OrUnless,=~${Case,=~${Default,=~${EndSelect,=~${EndSwith,=~${Loop,=~${Next,=~${MementoSectionEnd,=~FunctionEnd,=~SectionEnd,=~SectionGroupEnd,=~PageExEnd,0=~!macroend,0=~!if,0=~!else,0=~!endif +setlocal indentkeys+==~${Else,=~${EndIf,=~${EndUnless,=~${AndIf,=~${AndUnless,=~${OrIf,=~${OrUnless,=~${Case,=~${Default,=~${EndSelect,=~${EndSwitch,=~${Loop,=~${Next,=~${MementoSectionEnd,=~FunctionEnd,=~SectionEnd,=~SectionGroupEnd,=~PageExEnd,0=~!macroend,0=~!if,0=~!else,0=~!endif let b:undo_indent = "setl ai< inde< indk< si<" diff --git a/runtime/indent/php.vim b/runtime/indent/php.vim --- a/runtime/indent/php.vim +++ b/runtime/indent/php.vim @@ -327,13 +327,13 @@ endfun function! FindArrowIndent (lnum) " {{{ - let parrentArrowPos = -1 + let parentArrowPos = -1 let cursorPos = -1 let lnum = a:lnum while lnum > 1 let last_line = getline(lnum) if last_line =~ '^\s*->' - let parrentArrowPos = indent(a:lnum) + let parentArrowPos = indent(a:lnum) break else @@ -355,28 +355,28 @@ function! FindArrowIndent (lnum) " {{{ else endif else - let parrentArrowPos = -1 + let parentArrowPos = -1 break end endif if cleanedLnum =~ '->' call cursor(lnum, cursorPos == -1 ? strwidth(cleanedLnum) : cursorPos) - let parrentArrowPos = searchpos('->', 'cWb', lnum)[1] - 1 + let parentArrowPos = searchpos('->', 'cWb', lnum)[1] - 1 break else - let parrentArrowPos = -1 + let parentArrowPos = -1 break endif endif endwhile - if parrentArrowPos == -1 - let parrentArrowPos = indent(lnum) + shiftwidth() + if parentArrowPos == -1 + let parentArrowPos = indent(lnum) + shiftwidth() end - return parrentArrowPos + return parentArrowPos endfun "}}} function! FindTheIfOfAnElse (lnum, StopAfterFirstPrevElse) " {{{ diff --git a/runtime/indent/rapid.vim b/runtime/indent/rapid.vim --- a/runtime/indent/rapid.vim +++ b/runtime/indent/rapid.vim @@ -146,7 +146,7 @@ endfunction " Returns the length of the line until a:str occur outside a string or " comment. Search starts at string index a:startIdx. -" If a:str is a word also add word bounderies and case insesitivity. +" If a:str is a word also add word boundaries and case insensitivity. " Note: rapidTodoComment and rapidDebugComment are not taken into account. function s:RapidLenTilStr(lnum, str, startIdx) abort @@ -179,8 +179,8 @@ function s:RapidLenTilStr(lnum, str, sta return -1 endfunction -" a:lchar shoud be one of (, ), [, ], { or } -" returns the number of opening/closing parenthesise which have no +" a:lchar should be one of (, ), [, ], { or } +" returns the number of opening/closing parentheses which have no " closing/opening match in getline(a:lnum) function s:RapidLoneParen(lnum,lchar) abort if a:lchar == "(" || a:lchar == ")" @@ -205,7 +205,7 @@ function s:RapidLoneParen(lnum,lchar) ab endif let l:opnParen = 0 - " count opening brakets + " count opening brackets let l:i = 0 while l:i >= 0 let l:i = s:RapidLenTilStr(a:lnum, l:opnParChar, l:i) @@ -216,7 +216,7 @@ function s:RapidLoneParen(lnum,lchar) ab endwhile let l:clsParen = 0 - " count closing brakets + " count closing brackets let l:i = 0 while l:i >= 0 let l:i = s:RapidLenTilStr(a:lnum, l:clsParChar, l:i) @@ -242,7 +242,7 @@ function s:RapidPreNoneBlank(lnum) abort let nPreNoneBlank = prevnonblank(a:lnum) while nPreNoneBlank>0 && getline(nPreNoneBlank) =~ '\v\c^\s*(\%\%\%|!)' - " Previouse none blank line irrelevant. Look further aback. + " Previous none blank line irrelevant. Look further aback. let nPreNoneBlank = prevnonblank(nPreNoneBlank - 1) endwhile diff --git a/runtime/syntax/8th.vim b/runtime/syntax/8th.vim --- a/runtime/syntax/8th.vim +++ b/runtime/syntax/8th.vim @@ -363,7 +363,7 @@ syn region eighthComment start="\zs\\" e if !exists("did_eighth_syntax_inits") let did_eighth_syntax_inits=1 - " The default methods for highlighting. Can be overriden later. + " The default methods for highlighting. Can be overridden later. hi def link eighthTodo Todo hi def link eighthOperators Operator hi def link eighthMath Number diff --git a/runtime/syntax/a65.vim b/runtime/syntax/a65.vim --- a/runtime/syntax/a65.vim +++ b/runtime/syntax/a65.vim @@ -118,7 +118,7 @@ syn match a65Section "\(^\|\s\)\.)\($\|\ " Strings syn match a65String "\".*\"" -" Programm Counter +" Program Counter syn region a65PC start="\*=" end="\>" keepend " HI/LO Byte diff --git a/runtime/syntax/chaiscript.vim b/runtime/syntax/chaiscript.vim --- a/runtime/syntax/chaiscript.vim +++ b/runtime/syntax/chaiscript.vim @@ -61,7 +61,7 @@ syn region chaiscriptFunc match " Intentionally leaving out all of the normal, well known operators syn match chaiscriptOperator "\.\." -" Guard seperator as an operator +" Guard separator as an operator syn match chaiscriptOperator ":" " Comments diff --git a/runtime/syntax/euphoria4.vim b/runtime/syntax/euphoria4.vim --- a/runtime/syntax/euphoria4.vim +++ b/runtime/syntax/euphoria4.vim @@ -27,7 +27,7 @@ syn keyword euphoria4Debug includes inli " Keywords for conditional compilation - from $EUDIR/include/euphoria/keywords.e: syn keyword euphoria4PreProc elsedef elsifdef ifdef -" Keywords (Statments) - from $EUDIR/include/euphoria/keywords.e: +" Keywords (Statements) - from $EUDIR/include/euphoria/keywords.e: syn keyword euphoria4Keyword and as break by case constant continue do else syn keyword euphoria4Keyword elsif end entry enum exit export syn keyword euphoria4Keyword fallthru for function global goto if include diff --git a/runtime/syntax/flexwiki.vim b/runtime/syntax/flexwiki.vim --- a/runtime/syntax/flexwiki.vim +++ b/runtime/syntax/flexwiki.vim @@ -67,10 +67,10 @@ syntax match flexwikiEmoticons /\(( " Aggregate all the regular text highlighting into flexwikiText syntax cluster flexwikiText contains=flexwikiItalic,flexwikiBold,flexwikiCode,flexwikiDeEmphasis,flexwikiDelText,flexwikiInsText,flexwikiSuperScript,flexwikiSubScript,flexwikiCitation,flexwikiLink,flexwikiWord,flexwikiEmoticons -" single-line WikiPropertys +" single-line WikiProperties syntax match flexwikiSingleLineProperty /^:\?[A-Z_][_a-zA-Z0-9]\+:/ -" TODO: multi-line WikiPropertys +" TODO: multi-line WikiProperties " Header levels, 1-6 syntax match flexwikiH1 /^!.*$/ diff --git a/runtime/syntax/gdb.vim b/runtime/syntax/gdb.vim --- a/runtime/syntax/gdb.vim +++ b/runtime/syntax/gdb.vim @@ -30,7 +30,7 @@ syn keyword gdbStatement contained searc syn keyword gdbStatement contained stop target tbreak tdump tfind thbreak thread tp trace tstart tstatus tstop syn keyword gdbStatement contained tty und[isplay] unset until up watch whatis where while ws x syn match gdbFuncDef "\.*" -syn match gdbStatmentContainer "^\s*\S\+" contains=gdbStatement,gdbFuncDef +syn match gdbStatementContainer "^\s*\S\+" contains=gdbStatement,gdbFuncDef syn match gdbStatement "^\s*info" nextgroup=gdbInfo skipwhite skipempty " some commonly used abbreviations diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim --- a/runtime/syntax/groovy.vim +++ b/runtime/syntax/groovy.vim @@ -362,7 +362,7 @@ exec "syn sync ccomment groovyComment mi " Mark these as operators -" Hightlight brackets +" Highlight brackets " syn match groovyBraces "[{}]" " syn match groovyBraces "[\[\]]" " syn match groovyBraces "[\|]" diff --git a/runtime/syntax/lite.vim b/runtime/syntax/lite.vim --- a/runtime/syntax/lite.vim +++ b/runtime/syntax/lite.vim @@ -5,7 +5,7 @@ " Email: Subject: send syntax_vim.tgz " Last Change: 2001 Mai 01 " -" Options lite_sql_query = 1 for SQL syntax highligthing inside strings +" Options lite_sql_query = 1 for SQL syntax highlighting inside strings " lite_minlines = x to sync at least x lines backwards " quit when a syntax file was already loaded diff --git a/runtime/syntax/logtalk.vim b/runtime/syntax/logtalk.vim --- a/runtime/syntax/logtalk.vim +++ b/runtime/syntax/logtalk.vim @@ -330,7 +330,7 @@ syn match logtalkKeyword "\' "valid options for certain section headers diff --git a/runtime/syntax/sqlinformix.vim b/runtime/syntax/sqlinformix.vim --- a/runtime/syntax/sqlinformix.vim +++ b/runtime/syntax/sqlinformix.vim @@ -162,7 +162,7 @@ hi def link sqlNumber Number hi def link sqlBoolean Boolean hi def link sqlString String -" === Statment syntax group === +" === Statement syntax group === hi def link sqlStatement Statement hi def link sqlConditional Conditional hi def link sqlRepeat Repeat diff --git a/runtime/syntax/sqlj.vim b/runtime/syntax/sqlj.vim --- a/runtime/syntax/sqlj.vim +++ b/runtime/syntax/sqlj.vim @@ -16,7 +16,7 @@ endif " Read the Java syntax to start with source :p:h/java.vim -" SQLJ extentions +" SQLJ extensions " The SQL reserved words, defined as keywords. syn case ignore diff --git a/runtime/syntax/squid.vim b/runtime/syntax/squid.vim --- a/runtime/syntax/squid.vim +++ b/runtime/syntax/squid.vim @@ -31,7 +31,7 @@ syn keyword squidConf cache_effective_us syn keyword squidConf cache_host_domain cache_log cache_mem syn keyword squidConf cache_mem_high cache_mem_low cache_mgr syn keyword squidConf cachemgr_passwd cache_peer cache_peer_access -syn keyword squidConf cahce_replacement_policy cache_stoplist +syn keyword squidConf cache_replacement_policy cache_stoplist syn keyword squidConf cache_stoplist_pattern cache_store_log cache_swap syn keyword squidConf cache_swap_high cache_swap_log cache_swap_low syn keyword squidConf client_db client_lifetime client_netmask diff --git a/runtime/syntax/tasm.vim b/runtime/syntax/tasm.vim --- a/runtime/syntax/tasm.vim +++ b/runtime/syntax/tasm.vim @@ -1,6 +1,6 @@ " Vim syntax file " Language: TASM: turbo assembler by Borland -" Maintaner: FooLman of United Force +" Maintainer: FooLman of United Force " Last Change: 2012 Feb 03 by Thilo Six, and 2018 Nov 27. " quit when a syntax file was already loaded diff --git a/runtime/syntax/tf.vim b/runtime/syntax/tf.vim --- a/runtime/syntax/tf.vim +++ b/runtime/syntax/tf.vim @@ -27,7 +27,7 @@ syn keyword tfVar bamf bg_output borg c syn keyword tfVar emulation end_color gag gethostbyname gpri hook hilite contained syn keyword tfVar hiliteattr histsize hpri insert isize istrip kecho contained syn keyword tfVar kprefix login lp lpquote maildelay matching max_iter contained -syn keyword tfVar max_recur mecho more mprefix oldslash promt_sec contained +syn keyword tfVar max_recur mecho more mprefix oldslash prompt_sec contained syn keyword tfVar prompt_usec proxy_host proxy_port ptime qecho qprefix contained syn keyword tfVar quite quitdone redef refreshtime scroll shpause snarf sockmload contained syn keyword tfVar start_color tabsize telopt sub time_format visual contained diff --git a/runtime/syntax/tsalt.vim b/runtime/syntax/tsalt.vim --- a/runtime/syntax/tsalt.vim +++ b/runtime/syntax/tsalt.vim @@ -83,11 +83,11 @@ syn keyword tsaltFunction vGetChrs vGetC syn keyword tsaltFunction vPutChrsA vRstrArea vSaveArea " Dynamic Data Exchange (DDE) Operations -syn keyword tsaltFunction DDEExecute DDEInitate DDEPoke DDERequest +syn keyword tsaltFunction DDEExecute DDEInitiate DDEPoke DDERequest syn keyword tsaltFunction DDETerminate DDETerminateAll "END FUNCTIONS -"PREDEFINED VARAIABLES +"PREDEFINED VARIABLES syn keyword tsaltSysVar _add_lf _alarm_on _answerback_str _asc_rcrtrans syn keyword tsaltSysVar _asc_remabort _asc_rlftrans _asc_scpacing syn keyword tsaltSysVar _asc_scrtrans _asc_secho _asc_slpacing @@ -106,7 +106,7 @@ syn keyword tsaltSysVar _scr_chk_key _sc syn keyword tsaltSysVar _strip_high _swap_bs _telix_dir _up_dir syn keyword tsaltSysVar _usage_fname _zmodauto _zmod_rcrash syn keyword tsaltSysVar _zmod_scrash -"END PREDEFINED VARAIABLES +"END PREDEFINED VARIABLES "TYPE syn keyword tsaltType str int