aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-12-21 16:49:51 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-12-22 02:17:49 +0200
commit6f5a5622b94161ab851ec498f5a95a8ae181c785 (patch)
tree5a8ba500cd2926a285b47fb0791ccfd5596e4af8
parent7dc6ba3518a6e6578302275c9a20e30ac199b86d (diff)
downloadmeson-6f5a5622b94161ab851ec498f5a95a8ae181c785.zip
meson-6f5a5622b94161ab851ec498f5a95a8ae181c785.tar.gz
meson-6f5a5622b94161ab851ec498f5a95a8ae181c785.tar.bz2
Vim syntax highlighting fixes. Closes #1241.
-rw-r--r--syntax-highlighting/vim/indent/meson.vim (renamed from syntax-highlighting/vim/plugin/meson.vim)6
-rw-r--r--syntax-highlighting/vim/syntax/meson.vim2
2 files changed, 4 insertions, 4 deletions
diff --git a/syntax-highlighting/vim/plugin/meson.vim b/syntax-highlighting/vim/indent/meson.vim
index b219bdc..b00c942 100644
--- a/syntax-highlighting/vim/plugin/meson.vim
+++ b/syntax-highlighting/vim/indent/meson.vim
@@ -23,15 +23,15 @@ if exists("*GetMesonIndent")
finish
endif
let s:keepcpo= &cpo
-set cpo&vim
+setlocal cpo&vim
" Come here when loading the script the first time.
let s:maxoff = 50 " maximum number of lines to look backwards for ()
" Force sw=2 sts=2 because that's required by convention
-set shiftwidth=2
-set softtabstop=2
+setlocal shiftwidth=2
+setlocal softtabstop=2
function GetMesonIndent(lnum)
echom getline(line("."))
diff --git a/syntax-highlighting/vim/syntax/meson.vim b/syntax-highlighting/vim/syntax/meson.vim
index 21b7453..0799237 100644
--- a/syntax-highlighting/vim/syntax/meson.vim
+++ b/syntax-highlighting/vim/syntax/meson.vim
@@ -27,7 +27,7 @@ endif
" We need nocompatible mode in order to continue lines with backslashes.
" Original setting will be restored.
let s:cpo_save = &cpo
-set cpo&vim
+setlocal cpo&vim
" https://github.com/mesonbuild/meson/wiki/Syntax
syn keyword mesonConditional elif else if endif