aboutsummaryrefslogtreecommitdiff
path: root/vim/indent
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-10-30 15:11:08 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-10-30 15:11:08 +1300
commit29e34f2d4db59a481faa32e51078c3b75bc091b6 (patch)
tree8cf3daa8efa1db424b260b308b92cbb7d789aa49 /vim/indent
parentMove filetype-specific indent options into indent/ (diff)
downloaddotfiles-29e34f2d4db59a481faa32e51078c3b75bc091b6.tar.gz
dotfiles-29e34f2d4db59a481faa32e51078c3b75bc091b6.zip
Use a common file to restore global indent opts
Remove the duplicated code instated to use the global defaults for indent-related options and put it into a common file to source with :runtime.
Diffstat (limited to 'vim/indent')
-rw-r--r--vim/indent/_GLOBAL.vim6
-rw-r--r--vim/indent/c.vim8
-rw-r--r--vim/indent/html.vim8
-rw-r--r--vim/indent/perl.vim8
-rw-r--r--vim/indent/php.vim10
-rw-r--r--vim/indent/sh.vim8
6 files changed, 17 insertions, 31 deletions
diff --git a/vim/indent/_GLOBAL.vim b/vim/indent/_GLOBAL.vim
new file mode 100644
index 00000000..6ea25dbd
--- /dev/null
+++ b/vim/indent/_GLOBAL.vim
@@ -0,0 +1,6 @@
+" Source this file (probably with :runtime) to explicitly set local indent
+" settings for a buffer back to the global settings, in case it was changed
+" by a prior filetype (e.g. VimL).
+setlocal shiftwidth<
+setlocal softtabstop<
+setlocal tabstop<
diff --git a/vim/indent/c.vim b/vim/indent/c.vim
index 1be25bf5..fd1b26af 100644
--- a/vim/indent/c.vim
+++ b/vim/indent/c.vim
@@ -1,6 +1,2 @@
-" Explicitly set indent level; this matches the global default, but it's tidy
-" to enforce it in case we changed from a filetype with different value (e.g.
-" VimL)
-setlocal shiftwidth=4
-setlocal softtabstop=4
-setlocal tabstop=4
+" Restore local indent settings to the global values
+runtime indent/_GLOBAL.vim
diff --git a/vim/indent/html.vim b/vim/indent/html.vim
index 654aa407..7b16fb3a 100644
--- a/vim/indent/html.vim
+++ b/vim/indent/html.vim
@@ -1,9 +1,5 @@
-" Explicitly set indent level; this matches the global default, but it's tidy
-" to enforce it in case we changed from a filetype with different value (e.g.
-" VimL)
-setlocal shiftwidth=4
-setlocal softtabstop=4
-setlocal tabstop=4
+" Restore local indent settings to the global values
+runtime indent/_GLOBAL.vim
" Run tidy -eq -utf8 on file for the current buffer
nnoremap <leader>v :exe "!tidy -eq -utf8 " . shellescape(expand("%"))<CR>
diff --git a/vim/indent/perl.vim b/vim/indent/perl.vim
index 1be25bf5..fd1b26af 100644
--- a/vim/indent/perl.vim
+++ b/vim/indent/perl.vim
@@ -1,6 +1,2 @@
-" Explicitly set indent level; this matches the global default, but it's tidy
-" to enforce it in case we changed from a filetype with different value (e.g.
-" VimL)
-setlocal shiftwidth=4
-setlocal softtabstop=4
-setlocal tabstop=4
+" Restore local indent settings to the global values
+runtime indent/_GLOBAL.vim
diff --git a/vim/indent/php.vim b/vim/indent/php.vim
index 9e084f24..025bf3f1 100644
--- a/vim/indent/php.vim
+++ b/vim/indent/php.vim
@@ -1,11 +1,7 @@
+" Restore local indent settings to the global values
+runtime indent/_GLOBAL.vim
+
" Lie to the php.vim indent file and tell it that it's already loaded itself,
" to stop it processing its ridiculous expression-based indenting that never
" seems to do what I want. Just plain autoindent is fine.
let b:did_indent = 1
-
-" Explicitly set indent level; this matches the global default, but it's tidy
-" to enforce it in case we changed from a filetype with different value (e.g.
-" VimL)
-setlocal shiftwidth=4
-setlocal softtabstop=4
-setlocal tabstop=4
diff --git a/vim/indent/sh.vim b/vim/indent/sh.vim
index 1be25bf5..fd1b26af 100644
--- a/vim/indent/sh.vim
+++ b/vim/indent/sh.vim
@@ -1,6 +1,2 @@
-" Explicitly set indent level; this matches the global default, but it's tidy
-" to enforce it in case we changed from a filetype with different value (e.g.
-" VimL)
-setlocal shiftwidth=4
-setlocal softtabstop=4
-setlocal tabstop=4
+" Restore local indent settings to the global values
+runtime indent/_GLOBAL.vim