summaryrefslogtreecommitdiff
path: root/data/syntax-highlighting/vim/indent
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2018-11-27 21:10:47 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2018-11-30 01:19:10 +0200
commit80bdc71c0ed44f63e0f2f45f8e264e2022cc6658 (patch)
tree8f0153eefd9eaae7841bad486c82b8fbce500b15 /data/syntax-highlighting/vim/indent
parent0c23e6545711802be279566946983310ca11c1d8 (diff)
downloadmeson-80bdc71c0ed44f63e0f2f45f8e264e2022cc6658.tar.gz
syntax-highlighting: vim: Allow overriding shiftwidth and softtabstop
The vim syntax indentation rules stored in indent/meson.vim set the local shiftwidth and softtabstop variables. As the file is loaded last, after ~/.vim/after/ftplugin/meson.vim (when present), this prevents overriding the default values for shiftwidth and softtabstop in a local configuration. Fix this by setting shiftwidth and softtabstop in ftplugin/meson.vim instead (as done by the python indentiation rules in upstream vim for instance) to allow local overrides. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'data/syntax-highlighting/vim/indent')
-rw-r--r--data/syntax-highlighting/vim/indent/meson.vim4
1 files changed, 0 insertions, 4 deletions
diff --git a/data/syntax-highlighting/vim/indent/meson.vim b/data/syntax-highlighting/vim/indent/meson.vim
index 8553ec0e7..a6444dcf9 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("."))