aboutsummaryrefslogtreecommitdiff
path: root/vim
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-10-30 15:03:46 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-10-30 15:03:46 +1300
commit9858af6f41ff7d9f295384c45ef21d2f3892fbd3 (patch)
tree7ef47f447c49526d1a0885885b9d740250df2907 /vim
parent627a62f39d91506a82b63fd1c094aed323c7d894 (diff)
downloaddotfiles-9858af6f41ff7d9f295384c45ef21d2f3892fbd3.tar.gz
dotfiles-9858af6f41ff7d9f295384c45ef21d2f3892fbd3.zip
Move filetype-specific indent options into indent/
I'm still getting used to the structure of the configuration here, and had mistakenly put these indent-related settings into files in the ftplugin directory.
Diffstat (limited to 'vim')
-rw-r--r--vim/ftplugin/perl.vim7
-rw-r--r--vim/ftplugin/sh.vim7
-rw-r--r--vim/indent/c.vim (renamed from vim/ftplugin/c.vim)0
-rw-r--r--vim/indent/csv.vim (renamed from vim/ftplugin/csv.vim)0
-rw-r--r--vim/indent/html.vim (renamed from vim/ftplugin/html.vim)0
-rw-r--r--vim/indent/perl.vim (renamed from vim/ftplugin/php.vim)0
-rw-r--r--vim/indent/php.vim7
-rw-r--r--vim/indent/sh.vim6
-rw-r--r--vim/indent/tsv.vim (renamed from vim/ftplugin/tsv.vim)0
-rw-r--r--vim/indent/vim.vim (renamed from vim/ftplugin/vim.vim)0
10 files changed, 13 insertions, 14 deletions
diff --git a/vim/ftplugin/perl.vim b/vim/ftplugin/perl.vim
index 08d41008..dad2ce35 100644
--- a/vim/ftplugin/perl.vim
+++ b/vim/ftplugin/perl.vim
@@ -1,10 +1,3 @@
-" 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
-
" Run perl -c on file for the current buffer
nnoremap <leader>pc :exe "!perl -c " . shellescape(expand("%"))<CR>
" Run perlcritic on the file for the current buffer
diff --git a/vim/ftplugin/sh.vim b/vim/ftplugin/sh.vim
index 25e433e7..2b73611e 100644
--- a/vim/ftplugin/sh.vim
+++ b/vim/ftplugin/sh.vim
@@ -1,10 +1,3 @@
-" 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
-
" Default to POSIX shell, as I never write Bourne, and if I write Bash or Ksh
" it'll be denoted with either a shebang or an appropriate extension. At the
" time of writing, changing this also prompts sh.vim to set g:is_kornshell,
diff --git a/vim/ftplugin/c.vim b/vim/indent/c.vim
index 1be25bf5..1be25bf5 100644
--- a/vim/ftplugin/c.vim
+++ b/vim/indent/c.vim
diff --git a/vim/ftplugin/csv.vim b/vim/indent/csv.vim
index 3d78df97..3d78df97 100644
--- a/vim/ftplugin/csv.vim
+++ b/vim/indent/csv.vim
diff --git a/vim/ftplugin/html.vim b/vim/indent/html.vim
index 654aa407..654aa407 100644
--- a/vim/ftplugin/html.vim
+++ b/vim/indent/html.vim
diff --git a/vim/ftplugin/php.vim b/vim/indent/perl.vim
index 1be25bf5..1be25bf5 100644
--- a/vim/ftplugin/php.vim
+++ b/vim/indent/perl.vim
diff --git a/vim/indent/php.vim b/vim/indent/php.vim
index d0fb1f8f..9e084f24 100644
--- a/vim/indent/php.vim
+++ b/vim/indent/php.vim
@@ -2,3 +2,10 @@
" 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
new file mode 100644
index 00000000..1be25bf5
--- /dev/null
+++ b/vim/indent/sh.vim
@@ -0,0 +1,6 @@
+" 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/ftplugin/tsv.vim b/vim/indent/tsv.vim
index 53841357..53841357 100644
--- a/vim/ftplugin/tsv.vim
+++ b/vim/indent/tsv.vim
diff --git a/vim/ftplugin/vim.vim b/vim/indent/vim.vim
index b958fe54..b958fe54 100644
--- a/vim/ftplugin/vim.vim
+++ b/vim/indent/vim.vim