aboutsummaryrefslogtreecommitdiff
path: root/runtime/indent
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-05-25 16:31:48 -0400
committerJames McCoy <jamessan@jamessan.com>2016-05-25 21:05:01 -0400
commitd693a22de3d8fd5a8359450620ebadd329fe6f73 (patch)
tree275611ec2dba2884ec496214e766213efacaf3e1 /runtime/indent
parent2115fcdfd5a6b32b62dcd280c59843437c4702d6 (diff)
downloadrneovim-d693a22de3d8fd5a8359450620ebadd329fe6f73.tar.gz
rneovim-d693a22de3d8fd5a8359450620ebadd329fe6f73.tar.bz2
rneovim-d693a22de3d8fd5a8359450620ebadd329fe6f73.zip
vim-patch:acb4f22
Updated runtime files. https://github.com/vim/vim/commit/acb4f221c715a333f4c49a2235a8006c6ac6e4d5 Ignored changes to: * doc/eval.txt since alloc_fail isn't relevant for neovim * doc/index.txt for unmerge :smile command * doc/tags, syntax/vim.vim since they're generated at build time * doc/todo.txt
Diffstat (limited to 'runtime/indent')
-rw-r--r--runtime/indent/lua.vim4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/indent/lua.vim b/runtime/indent/lua.vim
index 393994c590..d1d2c0d600 100644
--- a/runtime/indent/lua.vim
+++ b/runtime/indent/lua.vim
@@ -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: 2014 Nov 12
+" Last Change: 2016 Jan 10
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
@@ -52,7 +52,7 @@ function! GetLuaIndent()
endif
endif
- " Subtract a 'shiftwidth' on end, else (and elseif), until and '}'
+ " Subtract a 'shiftwidth' on end, else, elseif, until and '}'
" 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"