aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ftdetect/json.vim1
-rw-r--r--vimrc13
2 files changed, 6 insertions, 8 deletions
diff --git a/ftdetect/json.vim b/ftdetect/json.vim
new file mode 100644
index 0000000..4db08ed
--- /dev/null
+++ b/ftdetect/json.vim
@@ -0,0 +1 @@
+autocmd BufRead,BufNewFile *.json set filetype=json syntax=javascript
diff --git a/vimrc b/vimrc
index 3fd3274..6b69099 100644
--- a/vimrc
+++ b/vimrc
@@ -133,6 +133,11 @@
" * Add a filetype plugin file for python, specifying PEP8 indentation
" and ensuring indentation is not preserved on blank lines.
"
+" 2014.05.17:
+" * Move JSON filetype detection from vimrc to ftdetect/json.vim. Now
+" that I know that such things exist, it's nice to keep things
+" organised.
+"
" Pathogen
@@ -463,14 +468,6 @@ command! CopyModeToggle call CopyModeToggle()
" autocmd bufwritepost .vimrc source $MYVIMRC
" endif
-" Filetype syntax highlighting
-augroup filetype_syntax_highlighting
- autocmd!
-
- " Set JSON files to JavaScript syntax
- autocmd BufRead,BufNewFile *.json set filetype=json syntax=javascript
-augroup END
-
" Indentation rules by file type
augroup filetype_indentation