aboutsummaryrefslogtreecommitdiff
path: root/runtime/indent/xml.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-07-29 01:58:17 +0200
committerJustin M. Keyes <justinkz@gmail.com>2019-07-29 20:50:07 +0200
commit80dda6892612de8405744b549aa2c2578a82a1b5 (patch)
tree79e13d529763466e3191f95eb302430b050e38ab /runtime/indent/xml.vim
parentf64486b6b6b70a05b357229f86b35ab25d92636e (diff)
downloadrneovim-80dda6892612de8405744b549aa2c2578a82a1b5.tar.gz
rneovim-80dda6892612de8405744b549aa2c2578a82a1b5.tar.bz2
rneovim-80dda6892612de8405744b549aa2c2578a82a1b5.zip
vim-patch:ba3ff539303c
Update runtime files https://github.com/vim/vim/commit/ba3ff539303c7bb6e46a6802dce3c7b2e55284e0
Diffstat (limited to 'runtime/indent/xml.vim')
-rw-r--r--runtime/indent/xml.vim6
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/indent/xml.vim b/runtime/indent/xml.vim
index dcafb467a6..7afcc89b7f 100644
--- a/runtime/indent/xml.vim
+++ b/runtime/indent/xml.vim
@@ -2,7 +2,9 @@
" Repository: https://github.com/chrisbra/vim-xml-ftplugin
" Maintainer: Christian Brabandt <cb@256bit.org>
" Previous Maintainer: Johannes Zellner <johannes@zellner.org>
-" Last Change: 20180724 - Correctly indent xml comments https://github.com/vim/vim/issues/3200
+" Last Change: 20181022 - Do not overwrite indentkeys setting
+" https://github.com/chrisbra/vim-xml-ftplugin/issues/1
+" 20180724 - Correctly indent xml comments https://github.com/vim/vim/issues/3200
" Notes: 1) does not indent pure non-xml code (e.g. embedded scripts)
" 2) will be confused by unbalanced tags in comments
" or CDATA sections.
@@ -19,7 +21,7 @@ set cpo&vim
" [-- local settings (must come before aborting the script) --]
setlocal indentexpr=XmlIndentGet(v:lnum,1)
-setlocal indentkeys=o,O,*<Return>,<>>,<<>,/,{,}
+setlocal indentkeys=o,O,*<Return>,<>>,<<>,/,{,},!^F
if !exists('b:xml_indent_open')
let b:xml_indent_open = '.\{-}<\a'