aboutsummaryrefslogtreecommitdiff
path: root/runtime/indent/cdl.vim
diff options
context:
space:
mode:
authorChristian Clason <christian.clason@uni-due.de>2021-09-13 16:33:41 +0200
committerGitHub <noreply@github.com>2021-09-13 16:33:41 +0200
commit5fd21b8d3e9dcb2b3dc3bdab4b58218ac908e3e8 (patch)
treed0df1b7dabb022b8f808e454e2f48cb63361e96d /runtime/indent/cdl.vim
parent1a9d2a4040f3ba3fe272488a7e85db6cdb453d39 (diff)
downloadrneovim-5fd21b8d3e9dcb2b3dc3bdab4b58218ac908e3e8.tar.gz
rneovim-5fd21b8d3e9dcb2b3dc3bdab4b58218ac908e3e8.tar.bz2
rneovim-5fd21b8d3e9dcb2b3dc3bdab4b58218ac908e3e8.zip
vim-patch:6c391a74fe90 (#15654)
Update runtime files https://github.com/vim/vim/commit/6c391a74fe90190796ca0b0c010112948a6e75d7 omit autoload/getscript.vim skip doc/eval.txt (needs 8.2.2468) skip doc/various.txt (needs 8.2.3400) (typofixes courtesy of @dundargoc)
Diffstat (limited to 'runtime/indent/cdl.vim')
-rw-r--r--runtime/indent/cdl.vim12
1 files changed, 6 insertions, 6 deletions
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