diff options
-rw-r--r-- | data/syntax-highlighting/vim/README | 3 | ||||
-rw-r--r-- | data/syntax-highlighting/vim/ftplugin/meson.vim | 15 | ||||
-rw-r--r-- | data/syntax-highlighting/vim/indent/meson.vim | 4 |
3 files changed, 17 insertions, 5 deletions
diff --git a/data/syntax-highlighting/vim/README b/data/syntax-highlighting/vim/README index 1afa243..95188fc 100644 --- a/data/syntax-highlighting/vim/README +++ b/data/syntax-highlighting/vim/README @@ -1,3 +1,4 @@ ftdetect sets the filetype +ftplugin sets Meson indentation rules +indent does Meson indentation syntax does Meson syntax highlighting -plugin does Meson indentation diff --git a/data/syntax-highlighting/vim/ftplugin/meson.vim b/data/syntax-highlighting/vim/ftplugin/meson.vim new file mode 100644 index 0000000..e21b61f --- /dev/null +++ b/data/syntax-highlighting/vim/ftplugin/meson.vim @@ -0,0 +1,15 @@ +" Vim filetype plugin file +" Language: meson +" Original Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com> +" Last Change: 2018 Nov 27 + +if exists("b:did_ftplugin") | finish | endif +let b:did_ftplugin = 1 +let s:keepcpo= &cpo +set cpo&vim + +setlocal shiftwidth=2 +setlocal softtabstop=2 + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/data/syntax-highlighting/vim/indent/meson.vim b/data/syntax-highlighting/vim/indent/meson.vim index 8553ec0..a6444dc 100644 --- a/data/syntax-highlighting/vim/indent/meson.vim +++ b/data/syntax-highlighting/vim/indent/meson.vim @@ -29,10 +29,6 @@ setlocal cpo&vim let s:maxoff = 50 " maximum number of lines to look backwards for () -" Force sw=2 sts=2 because that's required by convention -setlocal shiftwidth=2 -setlocal softtabstop=2 - function GetMesonIndent(lnum) echom getline(line(".")) |