mirror of
https://github.com/neovim/neovim.git
synced 2026-10-31 01:42:02 -05:00
vim-patch:3ec574f2b549
Update runtime files. Includes changing &sw to shiftwidth() for all indent scripts. https://github.com/vim/vim/commit/3ec574f2b549f456f664f689d6da36dc5719aeb9
This commit is contained in:
1 parent
599170de83
commit
a39bf01958
62 files changed
+328
-376
No files matched your search
@@ -2,7 +2,7 @@
|
||||
" Language: Lua script
|
||||
" Maintainer: Marcus Aurelius Farias <marcus.cf 'at' bol.com.br>
|
||||
" First Author: Max Ischenko <mfi 'at' ukr.net>
|
||||
" Last Change: 2016 Jan 10
|
||||
" Last Change: 2017 Jun 13
|
||||
|
||||
" Only load this indent file when no other was loaded.
|
||||
if exists("b:did_indent")
|
||||
@@ -48,7 +48,7 @@ function! GetLuaIndent()
|
||||
" Add 'shiftwidth' if what we found previously is not in a comment and
|
||||
" an "end" or "until" is not present on the same line.
|
||||
if synIDattr(synID(prevlnum, midx + 1, 1), "name") != "luaComment" && prevline !~ '\<end\>\|\<until\>'
|
||||
let ind = ind + &shiftwidth
|
||||
let ind = ind + shiftwidth()
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -56,7 +56,7 @@ function! GetLuaIndent()
|
||||
" This is the part that requires 'indentkeys'.
|
||||
let midx = match(getline(v:lnum), '^\s*\%(end\>\|else\>\|elseif\>\|until\>\|}\)')
|
||||
if midx != -1 && synIDattr(synID(v:lnum, midx + 1, 1), "name") != "luaComment"
|
||||
let ind = ind - &shiftwidth
|
||||
let ind = ind - shiftwidth()
|
||||
endif
|
||||
|
||||
return ind
|
||||
|
||||
Reference in new issue
Block a user