From 979f5c0b99136b053c93de82f1635bc22b97ee5b Mon Sep 17 00:00:00 2001
From: kn1cht <ito.turukasiwa@gmail.com>
Date: Sun, 11 Sep 2016 12:10:35 +0900
Subject: [PATCH 1/3] Fixed indent setting

---
 .vimrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vimrc b/.vimrc
index c3e2137..cc07f37 100644
--- a/.vimrc
+++ b/.vimrc
@@ -13,12 +13,12 @@ set autoindent
 set expandtab
 set list
 set listchars=tab:>\ ,trail:-,extends:>
-set shiftwidth=4
+set shiftwidth=2
 set showmatch
 set smartcase
 set smartindent
 set smarttab
-set tabstop=4
+set tabstop=2
 set whichwrap=b,s,h,l,<,>,[,]
 autocmd BufWritePre * :%s/\s\+$//ge
 autocmd BufWritePre * :%s/\t/  /ge

From ec79e286cee284c4d63590e8348a1efa465ad42f Mon Sep 17 00:00:00 2001
From: kn1cht <ito.turukasiwa@gmail.com>
Date: Mon, 12 Sep 2016 00:37:57 +0900
Subject: [PATCH 2/3] Add config for markdown syntax

---
 .vimrc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.vimrc b/.vimrc
index cc07f37..ea994e9 100644
--- a/.vimrc
+++ b/.vimrc
@@ -63,12 +63,13 @@ function! s:C()
     :w
     :!g++ --std=c++11 -O2 -Wall % -o x
 :endfunction
-"---------------------------------------------------------------------------
+""""""""""""""""""""""""""""""
+" md as markdown, instead of modula2
+autocmd BufNewFile,BufRead *.{md,mdwn,mkd,mkdn,mark*} set filetype=markdown
 
-" http://inari.hatenablog.com/entry/2014/05/05/231307
 """"""""""""""""""""""""""""""
+" http://inari.hatenablog.com/entry/2014/05/05/231307
 " 全角スペースの表示
-""""""""""""""""""""""""""""""
 function! ZenkakuSpace()
     highlight ZenkakuSpace cterm=underline ctermfg=lightblue guibg=darkgray
 endfunction
@@ -81,12 +82,10 @@ if has('syntax')
     augroup END
     call ZenkakuSpace()
 endif
-""""""""""""""""""""""""""""""
 
-" https://sites.google.com/site/fudist/Home/vim-nihongo-ban/-vimrc-sample
 """"""""""""""""""""""""""""""
+" https://sites.google.com/site/fudist/Home/vim-nihongo-ban/-vimrc-sample
 " 挿入モード時、ステータスラインの色を変更
-""""""""""""""""""""""""""""""
 let g:hi_insert = 'highlight StatusLine guifg=darkblue guibg=darkyellow gui=none ctermfg=blue ctermbg=yellow cterm=none'
 
 if has('syntax')
@@ -117,3 +116,4 @@ function! s:GetHighlight(hi)
     return hl
 endfunction
 """"""""""""""""""""""""""""""
+

From ae790ce4ea2aaf4cfb19ded279ecc974309f6f6d Mon Sep 17 00:00:00 2001
From: kn1cht <ito.turukasiwa@gmail.com>
Date: Tue, 13 Sep 2016 11:28:39 +0900
Subject: [PATCH 3/3] Add config for json syntax

---
 .vimrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.vimrc b/.vimrc
index ea994e9..9857cab 100644
--- a/.vimrc
+++ b/.vimrc
@@ -66,6 +66,8 @@ function! s:C()
 """"""""""""""""""""""""""""""
 " md as markdown, instead of modula2
 autocmd BufNewFile,BufRead *.{md,mdwn,mkd,mkdn,mark*} set filetype=markdown
+" json as javascript
+autocmd BufNewFile,BufRead *.{json} set filetype=javascript
 
 """"""""""""""""""""""""""""""
 " http://inari.hatenablog.com/entry/2014/05/05/231307