diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-10-29 09:18:30 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-10-29 09:21:00 +0100 |
| commit | bee8a0ae8c1301653a3f291dc1505fc72d24f2f0 (patch) | |
| tree | 9048fc31bcd2357ac465499f67450b381c308995 /runtime/ftplugin/xml.vim | |
| parent | c05b0d8ec7a29b29ca36a78041cb67eefc146b30 (diff) | |
| download | rneovim-bee8a0ae8c1301653a3f291dc1505fc72d24f2f0.tar.gz rneovim-bee8a0ae8c1301653a3f291dc1505fc72d24f2f0.tar.bz2 rneovim-bee8a0ae8c1301653a3f291dc1505fc72d24f2f0.zip | |
vim-patch:7db25fed5de1
Update runtime files.
https://github.com/vim/vim/commit/7db25fed5de1be922b8cbb0328149469606a0424
Diffstat (limited to 'runtime/ftplugin/xml.vim')
| -rw-r--r-- | runtime/ftplugin/xml.vim | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/runtime/ftplugin/xml.vim b/runtime/ftplugin/xml.vim index 236e870537..573a6ba441 100644 --- a/runtime/ftplugin/xml.vim +++ b/runtime/ftplugin/xml.vim @@ -1,8 +1,10 @@ " Vim filetype plugin file " Language: xml -" Maintainer: Dan Sharp <dwsharp at users dot sourceforge dot net> -" Last Changed: 20 Jan 2009 -" URL: http://dwsharp.users.sourceforge.net/vim/ftplugin +" Maintainer: Christian Brabandt <cb@256bit.org> +" Last Changed: May 08th, 2018 +" Repository: https://github.com/chrisbra/vim-xml-ftplugin +" Previous Maintainer: Dan Sharp <dwsharp at users dot sourceforge dot net> +" URL: http://dwsharp.users.sourceforge.net/vim/ftplugin if exists("b:did_ftplugin") | finish | endif let b:did_ftplugin = 1 @@ -10,16 +12,16 @@ let b:did_ftplugin = 1 " Make sure the continuation lines below do not cause problems in " compatibility mode. let s:save_cpo = &cpo -set cpo-=C +set cpo&vim setlocal commentstring=<!--%s--> -setlocal comments=s:<!--,m:\ \ \ \ \ ,e:--> +" Remove the middlepart from the comments section, as this causes problems: +" https://groups.google.com/d/msg/vim_dev/x4GT-nqa0Kg/jvtRnEbtAnMJ +setlocal comments=s:<!--,e:--> setlocal formatoptions-=t -if !exists("g:ft_xml_autocomment") || (g:ft_xml_autocomment == 1) - setlocal formatoptions+=croql -endif - +setlocal formatoptions+=croql +setlocal formatexpr=xmlformat#Format() " XML: thanks to Johannes Zellner and Akbar Ibrahim " - case sensitive @@ -39,7 +41,6 @@ if exists("loaded_matchit") \ '<\@<=\%([^ \t>/]\+\)\%(\s\+[^/>]*\|$\):/>' endif -" " For Omni completion, by Mikolaj Machowski. if exists('&ofu') setlocal ofu=xmlcomplete#CompleteTags @@ -47,17 +48,17 @@ endif command! -nargs=+ XMLns call xmlcomplete#CreateConnection(<f-args>) command! -nargs=? XMLent call xmlcomplete#CreateEntConnection(<f-args>) - " Change the :browse e filter to primarily show xml-related files. -if has("gui_win32") +if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") let b:browsefilter="XML Files (*.xml)\t*.xml\n" . - \ "DTD Files (*.dtd)\t*.dtd\n" . - \ "All Files (*.*)\t*.*\n" + \ "DTD Files (*.dtd)\t*.dtd\n" . + \ "XSD Files (*.xsd)\t*.xsd\n" . + \ "All Files (*.*)\t*.*\n" endif " Undo the stuff we changed. -let b:undo_ftplugin = "setlocal commentstring< comments< formatoptions<" . - \ " | unlet! b:match_ignorecase b:match_words b:browsefilter" +let b:undo_ftplugin = "setlocal commentstring< comments< formatoptions< formatexpr< " . + \ " | unlet! b:match_ignorecase b:match_words b:browsefilter" " Restore the saved compatibility options. let &cpo = s:save_cpo |