diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-09-09 21:55:11 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-09-09 21:55:11 +0200 |
commit | 6c391a74fe90190796ca0b0c010112948a6e75d7 (patch) | |
tree | 6f313c0f99a43bba9d48cee72d6ba1ed7fc95e26 /runtime/indent | |
parent | d176ca3dde47c11aae0376c31b7e1ba0939c8c6c (diff) |
Update runtime files
Diffstat (limited to 'runtime/indent')
-rw-r--r-- | runtime/indent/ada.vim | 2 | ||||
-rw-r--r-- | runtime/indent/cdl.vim | 12 | ||||
-rw-r--r-- | runtime/indent/config.vim | 4 | ||||
-rw-r--r-- | runtime/indent/dtd.vim | 6 | ||||
-rw-r--r-- | runtime/indent/erlang.vim | 8 | ||||
-rw-r--r-- | runtime/indent/json.vim | 2 | ||||
-rw-r--r-- | runtime/indent/lifelines.vim | 2 | ||||
-rw-r--r-- | runtime/indent/objc.vim | 2 | ||||
-rw-r--r-- | runtime/indent/pov.vim | 2 | ||||
-rw-r--r-- | runtime/indent/ruby.vim | 2 | ||||
-rw-r--r-- | runtime/indent/sqlanywhere.vim | 2 | ||||
-rw-r--r-- | runtime/indent/systemverilog.vim | 4 | ||||
-rw-r--r-- | runtime/indent/tex.vim | 2 | ||||
-rw-r--r-- | runtime/indent/treetop.vim | 2 | ||||
-rw-r--r-- | runtime/indent/typescript.vim | 2 | ||||
-rw-r--r-- | runtime/indent/verilog.vim | 4 |
16 files changed, 29 insertions, 29 deletions
diff --git a/runtime/indent/ada.vim b/runtime/indent/ada.vim index 1ca7fbacbe..6c8ab05267 100644 --- a/runtime/indent/ada.vim +++ b/runtime/indent/ada.vim @@ -219,7 +219,7 @@ function GetAdaIndent() " Move indent in twice (next 'when' will move back) let ind = ind + 2 * shiftwidth() elseif line =~ '^\s*end\s*record\>' - " Move indent back to tallying 'type' preceeding the 'record'. + " Move indent back to tallying 'type' preceding the 'record'. " Allow indent to be equal to 'end record's. let ind = s:MainBlockIndent( ind+shiftwidth(), lnum, 'type\>', '' ) elseif line =~ '\(^\s*new\>.*\)\@<!)\s*[;,]\s*$' diff --git a/runtime/indent/cdl.vim b/runtime/indent/cdl.vim index 4f9b7a8967..fb4fe27310 100644 --- a/runtime/indent/cdl.vim +++ b/runtime/indent/cdl.vim @@ -16,8 +16,8 @@ if exists("*CdlGetIndent") "finish endif -" find out if an "...=..." expresion is an assignment (or a conditional) -" it scans 'line' first, and then the previos lines +" find out if an "...=..." expression is an assignment (or a conditional) +" it scans 'line' first, and then the previous lines fun! CdlAsignment(lnum, line) let f = -1 let lnum = a:lnum @@ -33,7 +33,7 @@ fun! CdlAsignment(lnum, line) endif " it's formula if there's a ';', 'elsE', 'theN', 'enDif' or 'expr' " conditional if there's a '<', '>', 'elseif', 'if', 'and', 'or', 'not', - " 'memberis', 'childrenof' and other \k\+of funcions + " 'memberis', 'childrenof' and other \k\+of functions let f = line[inicio-1] =~? '[en;]' || strpart(line, inicio-4, 4) =~? 'ndif\|expr' endw let lnum = prevnonblank(lnum-1) @@ -106,7 +106,7 @@ fun! CdlGetIndent(lnum) elseif c == '(' || c ==? 'f' " '(' or 'if' let ind = ind + shiftwidth() else " c == '=' - " if it is an asignment increase indent + " if it is an assignment increase indent if f == -1 " we don't know yet, find out let f = CdlAsignment(lnum, strpart(line, 0, inicio)) end @@ -117,11 +117,11 @@ fun! CdlGetIndent(lnum) endw " CURRENT LINE, if it starts with a closing element, decrease indent - " or if it starts with '=' (asignment), increase indent + " or if it starts with '=' (assignment), increase indent if match(thisline, '^\c\s*\(else\|then\|endif\|[);]\)') >= 0 let ind = ind - shiftwidth() elseif match(thisline, '^\s*=') >= 0 - if f == -1 " we don't know yet if is an asignment, find out + if f == -1 " we don't know yet if is an assignment, find out let f = CdlAsignment(lnum, "") end if f == 1 " formula increase it diff --git a/runtime/indent/config.vim b/runtime/indent/config.vim index 074f467bee..c987a78d64 100644 --- a/runtime/indent/config.vim +++ b/runtime/indent/config.vim @@ -62,8 +62,8 @@ function GetConfigIndent() let ind = s:GetOffsetOf(line, '\[') endif - " if previous line had an unmatched closing parantheses, - " indent to the matching opening parantheses + " if previous line had an unmatched closing parentheses, + " indent to the matching opening parentheses if line =~ '[^(]\+\\\@<!)$' call search(')', 'bW') let lnum = searchpair('\\\@<!(', '', ')', 'bWn') diff --git a/runtime/indent/dtd.vim b/runtime/indent/dtd.vim index 963ac408ef..30c06aa8b2 100644 --- a/runtime/indent/dtd.vim +++ b/runtime/indent/dtd.vim @@ -119,16 +119,16 @@ function GetDTDIndent() " Next comes the content model. If the token we’ve found isn’t a " parenthesis it must be either ANY, EMPTY or some random junk. Either " way, we’re done indenting this element, so set it to that of the first - " line so that the terminating “>” winds up having the same indention. + " line so that the terminating “>” winds up having the same indentation. if token != '(' return indent endif " Now go through the content model. We need to keep track of the nesting " of parentheses. As soon as we hit 0 we’re done. If that happens we must - " have a complete content model. Thus set indention to be the same as that + " have a complete content model. Thus set indentation to be the same as that " of the first line so that the terminating “>” winds up having the same - " indention. Otherwise, we’ll indent to the innermost parentheses not yet + " indentation. Otherwise, we’ll indent to the innermost parentheses not yet " matched. let [indent_of_innermost, end] = s:indent_to_innermost_parentheses(line, end) if indent_of_innermost != -1 diff --git a/runtime/indent/erlang.vim b/runtime/indent/erlang.vim index 625cfde0c1..4e7bf4ef4d 100644 --- a/runtime/indent/erlang.vim +++ b/runtime/indent/erlang.vim @@ -57,7 +57,7 @@ endfunction " ====================== " Indtokens are "indentation tokens". See their exact format in the -" documentaiton of the s:GetTokensFromLine function. +" documentation of the s:GetTokensFromLine function. " Purpose: " Calculate the new virtual column after the given segment of a line. @@ -75,7 +75,7 @@ endfunction " s:CalcVCol("\t'\tx', b", 1, 4, 4) -> 10 function! s:CalcVCol(line, first_index, last_index, vcol, tabstop) - " We copy the relevent segment of the line, otherwise if the line were + " We copy the relevant segment of the line, otherwise if the line were " e.g. `"\t", term` then the else branch below would consume the `", term` " part at once. let line = a:line[a:first_index : a:last_index] @@ -604,7 +604,7 @@ endfunction function! s:BeginElementFoundIfEmpty(stack, token, curr_vcol, stored_vcol, sw) if empty(a:stack) if a:stored_vcol ==# -1 - call s:Log(' "' . a:token . '" directly preceeds LTI -> return') + call s:Log(' "' . a:token . '" directly precedes LTI -> return') return [1, a:curr_vcol + a:sw] else call s:Log(' "' . a:token . @@ -825,7 +825,7 @@ function! s:ErlangCalcIndent2(lnum, stack) if ret | return res | endif if stored_vcol ==# -1 - call s:Log(' End of clause directly preceeds LTI -> return') + call s:Log(' End of clause directly precedes LTI -> return') return 0 else call s:Log(' End of clause (but not end of line) -> return') diff --git a/runtime/indent/json.vim b/runtime/indent/json.vim index c649e37013..09c7d7a85a 100644 --- a/runtime/indent/json.vim +++ b/runtime/indent/json.vim @@ -1,6 +1,6 @@ " Vim indent file " Language: JSON -" Mantainer: Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json +" Maintainer: Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json " Last Change: 2020 Aug 30 " https://github.com/jakar/vim-json/commit/20b650e22aa750c4ab6a66aa646bdd95d7cd548a#diff-e81fc111b2052e306d126bd9989f7b7c " Original Author: Rogerz Zhang <rogerz.zhang at gmail.com> http://github.com/rogerz/vim-json diff --git a/runtime/indent/lifelines.vim b/runtime/indent/lifelines.vim index 0d9b2b46e4..e6d61617dc 100644 --- a/runtime/indent/lifelines.vim +++ b/runtime/indent/lifelines.vim @@ -11,7 +11,7 @@ endif let b:did_indent = 1 " LifeLines uses cindent without ; line terminator, C functions -" declarations, C keywords, C++ formating +" declarations, C keywords, C++ formatting setlocal cindent setlocal cinwords="" setlocal cinoptions+=+0 diff --git a/runtime/indent/objc.vim b/runtime/indent/objc.vim index beadca9fa4..a5451a5a11 100644 --- a/runtime/indent/objc.vim +++ b/runtime/indent/objc.vim @@ -15,7 +15,7 @@ setlocal cindent " Set the function to do the work. setlocal indentexpr=GetObjCIndent() -" To make a colon (:) suggest an indentation other than a goto/swich label, +" To make a colon (:) suggest an indentation other than a goto/switch label, setlocal indentkeys-=: setlocal indentkeys+=<:> diff --git a/runtime/indent/pov.vim b/runtime/indent/pov.vim index e806756c8e..f74c96b7f7 100644 --- a/runtime/indent/pov.vim +++ b/runtime/indent/pov.vim @@ -44,7 +44,7 @@ function GetPoVRayIndent() return -1 endif - " Search backwards for the frist non-empty, non-comment line. + " Search backwards for the first non-empty, non-comment line. let plnum = prevnonblank(v:lnum - 1) let plind = indent(plnum) while plnum > 0 && synIDattr(synID(plnum, plind+1, 0), "name") =~? "comment" diff --git a/runtime/indent/ruby.vim b/runtime/indent/ruby.vim index 2a267fdab3..559d8652a6 100644 --- a/runtime/indent/ruby.vim +++ b/runtime/indent/ruby.vim @@ -265,7 +265,7 @@ function! GetRubyIndent(...) abort \ ] " Most Significant line based on the previous one -- in case it's a - " contination of something above + " continuation of something above let indent_info.plnum_msl = s:GetMSL(indent_info.plnum) for callback_name in indent_callback_names diff --git a/runtime/indent/sqlanywhere.vim b/runtime/indent/sqlanywhere.vim index 601c567adc..d39fa3240e 100644 --- a/runtime/indent/sqlanywhere.vim +++ b/runtime/indent/sqlanywhere.vim @@ -9,7 +9,7 @@ " Notes: " Indenting keywords are based on Oracle and Sybase Adaptive Server " Anywhere (ASA). Test indenting was done with ASA stored procedures and -" fuctions and Oracle packages which contain stored procedures and +" functions and Oracle packages which contain stored procedures and " functions. " This has not been tested against Microsoft SQL Server or " Sybase Adaptive Server Enterprise (ASE) which use the Transact-SQL diff --git a/runtime/indent/systemverilog.vim b/runtime/indent/systemverilog.vim index 590fd4d998..16fb4515c5 100644 --- a/runtime/indent/systemverilog.vim +++ b/runtime/indent/systemverilog.vim @@ -64,7 +64,7 @@ function SystemVerilogIndent() let vverb = 0 endif - " Indent accoding to last line + " Indent according to last line " End of multiple-line comment if last_line =~ '\*/\s*$' && last_line !~ '/\*.\{-}\*/' let ind = ind - offset_comment1 @@ -220,7 +220,7 @@ function SystemVerilogIndent() endif - " Return the indention + " Return the indentation return ind endfunction diff --git a/runtime/indent/tex.vim b/runtime/indent/tex.vim index 8a44ade1ac..d356ba905b 100644 --- a/runtime/indent/tex.vim +++ b/runtime/indent/tex.vim @@ -288,7 +288,7 @@ function! GetTeXIndent() " {{{ let ind = ind - shiftwidth() let stay = 0 endif - " lines following to '\item' are intented once again: + " lines following to '\item' are indented once again: if line =~ g:tex_items let ind = ind + shiftwidth() let stay = 0 diff --git a/runtime/indent/treetop.vim b/runtime/indent/treetop.vim index 2c6eecf5c4..42ec1c8ad9 100644 --- a/runtime/indent/treetop.vim +++ b/runtime/indent/treetop.vim @@ -34,5 +34,5 @@ function GetTreetopIndent() let ind -= shiftwidth() end - retur ind + return ind endfunction diff --git a/runtime/indent/typescript.vim b/runtime/indent/typescript.vim index b6b2cb5acf..e899f83d0f 100644 --- a/runtime/indent/typescript.vim +++ b/runtime/indent/typescript.vim @@ -460,7 +460,7 @@ function! Fixedgq(lnum, count) return 1 endif - " Put all the lines on one line and do normal spliting after that + " Put all the lines on one line and do normal splitting after that if l:count > 1 while l:count > 1 let l:count -= 1 diff --git a/runtime/indent/verilog.vim b/runtime/indent/verilog.vim index ab3d0ba3e0..e81197c3b4 100644 --- a/runtime/indent/verilog.vim +++ b/runtime/indent/verilog.vim @@ -76,7 +76,7 @@ function GetVerilogIndent() let vverb = 0 endif - " Indent accoding to last line + " Indent according to last line " End of multiple-line comment if last_line =~ '\*/\s*$' && last_line !~ '/\*.\{-}\*/' let ind = ind - offset_comment1 @@ -219,7 +219,7 @@ function GetVerilogIndent() endif - " Return the indention + " Return the indentation return ind endfunction |