Update

4 files changed, 134 insertions, 136 deletions

diff --git a/vim/autoload/foo.vim b/vim/autoload/foo.vim
deleted file mode 100644
index 223f482..0000000
--- a/vim/autoload/foo.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-function bar#Hello()
-    echo "Hello"
-endfunction
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 345ebb2..9128b8d 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -80,8 +80,9 @@ map <leader>pp :setlocal paste!<CR>
 
 " Switch CWD to the directory of the open buffer
 nnoremap cd :cd %:p:h<CR>:pwd<CR>
-" Switch CDW to root git directory
+" Switch CWD to root git directory
 nnoremap cdg :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h'))<CR>:pwd<CR>
+
 " alias for cd
 nnoremap cdd :cd<space>
 nnoremap cd.. :cd .. <CR>:pwd<CR>
diff --git a/vim/init/special_highlight.vim b/vim/init/special_highlight.vim
index 9729183..26d2787 100644
--- a/vim/init/special_highlight.vim
+++ b/vim/init/special_highlight.vim
@@ -5,9 +5,9 @@
 syntax enable
 
 function! GetHighlightGroupName()
-    let l:syntaxID = synID(line('.'), col('.'), 1)
-    let l:groupName = synIDattr(l:syntaxID, 'name')
-    echo "Highlight Group Name: " . l:groupName
+  let l:syntaxID = synID(line('.'), col('.'), 1)
+  let l:groupName = synIDattr(l:syntaxID, 'name')
+  echo "Highlight Group Name: " . l:groupName
 endfunction
 
 " Defualt highlight for matched parenthesis is so weird in many colorscheme
diff --git a/vim/init/style.vim b/vim/init/style.vim
index a96601a..4a3d712 100644
--- a/vim/init/style.vim
+++ b/vim/init/style.vim
@@ -77,15 +77,15 @@ hi! clear SpellCap
 hi! clear SpellRare
 hi! clear SpellLocal
 if has('gui_running')
-        hi! SpellBad gui=undercurl guisp=red
-        hi! SpellCap gui=undercurl guisp=blue
-        hi! SpellRare gui=undercurl guisp=magenta
-        hi! SpellRare gui=undercurl guisp=cyan
+  hi! SpellBad gui=undercurl guisp=red
+  hi! SpellCap gui=undercurl guisp=blue
+  hi! SpellRare gui=undercurl guisp=magenta
+  hi! SpellRare gui=undercurl guisp=cyan
 else
-        hi! SpellBad term=standout ctermfg=1 term=underline cterm=underline
-        hi! SpellCap term=underline cterm=underline
-        hi! SpellRare term=underline cterm=underline
-        hi! SpellLocal term=underline cterm=underline
+  hi! SpellBad term=standout ctermfg=1 term=underline cterm=underline
+  hi! SpellCap term=underline cterm=underline
+  hi! SpellRare term=underline cterm=underline
+  hi! SpellLocal term=underline cterm=underline
 endif
 
 " 去掉 sign column 的白色背景
@@ -93,7 +93,7 @@ hi! SignColumn guibg=NONE ctermbg=NONE
 
 " 修改行号为浅灰色，默认主题的黄色行号很难看，换主题可以仿照修改
 highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE
-        \ gui=NONE guifg=DarkGrey guibg=NONE
+      \ gui=NONE guifg=DarkGrey guibg=NONE
 
 " 修正补全目录的色彩：默认太难看
 hi! Pmenu guibg=gray guifg=black ctermbg=gray ctermfg=black
@@ -104,12 +104,12 @@ hi! PmenuSel guibg=gray guifg=brown ctermbg=brown ctermfg=gray
 " 终端设置，隐藏行号和侧边栏
 "----------------------------------------------------------------------
 if has('terminal') && exists(':terminal') == 2
-        if exists('##TerminalOpen')
-                augroup VimUnixTerminalGroup
-                        au!
-                        au TerminalOpen * setlocal nonumber signcolumn=no
-                augroup END
-        endif
+  if exists('##TerminalOpen')
+    augroup VimUnixTerminalGroup
+      au!
+      au TerminalOpen * setlocal nonumber signcolumn=no
+    augroup END
+  endif
 endif
 
 
@@ -117,8 +117,8 @@ endif
 " quickfix 设置，隐藏行号
 "----------------------------------------------------------------------
 augroup VimInitStyle
-        au!
-        au FileType qf setlocal nonumber
+  au!
+  au FileType qf setlocal nonumber
 augroup END
 
 
@@ -129,7 +129,7 @@ augroup END
 " 3: [1] filename.txt
 "----------------------------------------------------------------------
 if has('gui_running')
-        let g:config_vim_tab_style = 3
+  let g:config_vim_tab_style = 3
 endif
 
 
@@ -137,31 +137,31 @@ endif
 " 终端下的 tabline
 "----------------------------------------------------------------------
 function! Vim_NeatTabLine()
-        let s = ''
-        for i in range(tabpagenr('$'))
-                " select the highlighting
-                if i + 1 == tabpagenr()
-                        let s .= '%#TabLineSel#'
-                else
-                        let s .= '%#TabLine#'
-                endif
-
-                " set the tab page number (for mouse clicks)
-                let s .= '%' . (i + 1) . 'T'
-
-                " the label is made by MyTabLabel()
-                let s .= ' %{Vim_NeatTabLabel(' . (i + 1) . ')} '
-        endfor
-
-        " after the last tab fill with TabLineFill and reset tab page nr
-        let s .= '%#TabLineFill#%T'
-
-        " right-align the label to close the current tab page
-        if tabpagenr('$') > 1
-                let s .= '%=%#TabLine#%999XX'
-        endif
-
-        return s
+  let s = ''
+  for i in range(tabpagenr('$'))
+    " select the highlighting
+    if i + 1 == tabpagenr()
+      let s .= '%#TabLineSel#'
+    else
+      let s .= '%#TabLine#'
+    endif
+
+    " set the tab page number (for mouse clicks)
+    let s .= '%' . (i + 1) . 'T'
+
+    " the label is made by MyTabLabel()
+    let s .= ' %{Vim_NeatTabLabel(' . (i + 1) . ')} '
+  endfor
+
+  " after the last tab fill with TabLineFill and reset tab page nr
+  let s .= '%#TabLineFill#%T'
+
+  " right-align the label to close the current tab page
+  if tabpagenr('$') > 1
+    let s .= '%=%#TabLine#%999XX'
+  endif
+
+  return s
 endfunc
 
 
@@ -169,39 +169,39 @@ endfunc
 " 需要显示到标签上的文件名
 "----------------------------------------------------------------------
 function! Vim_NeatBuffer(bufnr, fullname)
-        let l:name = bufname(a:bufnr)
-        if getbufvar(a:bufnr, '&modifiable')
-                if l:name == ''
-                        return '[No Name]'
-                else
-                        if a:fullname
-                                return fnamemodify(l:name, ':p')
-                        else
-                                let aname = fnamemodify(l:name, ':p')
-                                let sname = fnamemodify(aname, ':t')
-                                if sname == ''
-                                        let test = fnamemodify(aname, ':h:t')
-                                        if test != ''
-                                                return '<'. test . '>'
-                                        endif
-                                endif
-                                return sname
-                        endif
-                endif
-        else
-                let l:buftype = getbufvar(a:bufnr, '&buftype')
-                if l:buftype == 'quickfix'
-                        return '[Quickfix]'
-                elseif l:name != ''
-                        if a:fullname
-                                return '-'.fnamemodify(l:name, ':p')
-                        else
-                                return '-'.fnamemodify(l:name, ':t')
-                        endif
-                else
-                endif
-                return '[No Name]'
-        endif
+  let l:name = bufname(a:bufnr)
+  if getbufvar(a:bufnr, '&modifiable')
+    if l:name == ''
+      return '[No Name]'
+    else
+      if a:fullname
+        return fnamemodify(l:name, ':p')
+      else
+        let aname = fnamemodify(l:name, ':p')
+        let sname = fnamemodify(aname, ':t')
+        if sname == ''
+          let test = fnamemodify(aname, ':h:t')
+          if test != ''
+            return '<'. test . '>'
+          endif
+        endif
+        return sname
+      endif
+    endif
+  else
+    let l:buftype = getbufvar(a:bufnr, '&buftype')
+    if l:buftype == 'quickfix'
+      return '[Quickfix]'
+    elseif l:name != ''
+      if a:fullname
+        return '-'.fnamemodify(l:name, ':p')
+      else
+        return '-'.fnamemodify(l:name, ':t')
+      endif
+    else
+    endif
+    return '[No Name]'
+  endif
 endfunc
 
 
@@ -209,23 +209,23 @@ endfunc
 " 标签栏文字，使用 [1] filename 的模式
 "----------------------------------------------------------------------
 function! Vim_NeatTabLabel(n)
-        let l:buflist = tabpagebuflist(a:n)
-        let l:winnr = tabpagewinnr(a:n)
-        let l:bufnr = l:buflist[l:winnr - 1]
-        let l:fname = Vim_NeatBuffer(l:bufnr, 0)
-        let l:num = a:n
-        let style = get(g:, 'config_vim_tab_style', 0)
-        if style == 0
-                return l:fname
-        elseif style == 1
-                return "[".l:num."] ".l:fname
-        elseif style == 2
-                return "".l:num." - ".l:fname
-        endif
-        if getbufvar(l:bufnr, '&modified')
-                return "[".l:num."] ".l:fname." +"
-        endif
-        return "[".l:num."] ".l:fname
+  let l:buflist = tabpagebuflist(a:n)
+  let l:winnr = tabpagewinnr(a:n)
+  let l:bufnr = l:buflist[l:winnr - 1]
+  let l:fname = Vim_NeatBuffer(l:bufnr, 0)
+  let l:num = a:n
+  let style = get(g:, 'config_vim_tab_style', 0)
+  if style == 0
+    return l:fname
+  elseif style == 1
+    return "[".l:num."] ".l:fname
+  elseif style == 2
+    return "".l:num." - ".l:fname
+  endif
+  if getbufvar(l:bufnr, '&modified')
+    return "[".l:num."] ".l:fname." +"
+  endif
+  return "[".l:num."] ".l:fname
 endfunc
 
 
@@ -233,23 +233,23 @@ endfunc
 " GUI 下的标签文字，使用 [1] filename 的模式
 "----------------------------------------------------------------------
 function! Vim_NeatGuiTabLabel()
-        let l:num = v:lnum
-        let l:buflist = tabpagebuflist(l:num)
-        let l:winnr = tabpagewinnr(l:num)
-        let l:bufnr = l:buflist[l:winnr - 1]
-        let l:fname = Vim_NeatBuffer(l:bufnr, 0)
-        let style = get(g:, 'config_vim_tab_style', 0)
-        if style == 0
-                return l:fname
-        elseif style == 1
-                return "[".l:num."] ".l:fname
-        elseif style == 2
-                return "".l:num." - ".l:fname
-        endif
-        if getbufvar(l:bufnr, '&modified')
-                return "[".l:num."] ".l:fname." +"
-        endif
-        return "[".l:num."] ".l:fname
+  let l:num = v:lnum
+  let l:buflist = tabpagebuflist(l:num)
+  let l:winnr = tabpagewinnr(l:num)
+  let l:bufnr = l:buflist[l:winnr - 1]
+  let l:fname = Vim_NeatBuffer(l:bufnr, 0)
+  let style = get(g:, 'config_vim_tab_style', 0)
+  if style == 0
+    return l:fname
+  elseif style == 1
+    return "[".l:num."] ".l:fname
+  elseif style == 2
+    return "".l:num." - ".l:fname
+  endif
+  if getbufvar(l:bufnr, '&modified')
+    return "[".l:num."] ".l:fname." +"
+  endif
+  return "[".l:num."] ".l:fname
 endfunc
 
 
@@ -258,25 +258,25 @@ endfunc
 " 设置 GUI 标签的 tips: 显示当前标签有哪些窗口
 "----------------------------------------------------------------------
 function! Vim_NeatGuiTabTip()
-        let tip = ''
-        let bufnrlist = tabpagebuflist(v:lnum)
-        for bufnr in bufnrlist
-                " separate buffer entries
-                if tip != ''
-                        let tip .= " \n"
-                endif
-                " Add name of buffer
-                let name = Vim_NeatBuffer(bufnr, 1)
-                let tip .= name
-                " add modified/modifiable flags
-                if getbufvar(bufnr, "&modified")
-                        let tip .= ' [+]'
-                endif
-                if getbufvar(bufnr, "&modifiable")==0
-                        let tip .= ' [-]'
-                endif
-        endfor
-        return tip
+  let tip = ''
+  let bufnrlist = tabpagebuflist(v:lnum)
+  for bufnr in bufnrlist
+    " separate buffer entries
+    if tip != ''
+      let tip .= " \n"
+    endif
+    " Add name of buffer
+    let name = Vim_NeatBuffer(bufnr, 1)
+    let tip .= name
+    " add modified/modifiable flags
+    if getbufvar(bufnr, "&modified")
+      let tip .= ' [+]'
+    endif
+    if getbufvar(bufnr, "&modifiable")==0
+      let tip .= ' [-]'
+    endif
+  endfor
+  return tip
 endfunc