1 files changed, 19 insertions, 29 deletions

diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index c066f07..42dab16 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -76,19 +76,17 @@ set shiftwidth=2
 set cindent
 set ttimeout
 set ttimeoutlen=50
-" set updatetime=1000
+" set updatetime=4000
 " autocmd CursorHold * normal! m'
 
-imap <C-c> <Esc>l
-
 " TAB ----------------{{{
 
 set expandtab
 set softtabstop=-1
 
-" 顯示分隔符號
-set list
-set listchars=tab:â–·â–·,extends:>,precedes:<
+" Invisible chars
+set nolist
+set listchars=tab:»·,extends:>,precedes:<
 
 " }}}
 
@@ -118,13 +116,27 @@ augroup vimStartup
   " (it's likely a different one than last time).
   autocmd BufReadPost *
         \ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
-        \ |   exe "normal! g`\"zv"
+        \ |   try | silent execute 'normal! g`"zv' | endtry
         \ | endif
 augroup END
 
 " }}}
 
 " }}}
+" FOLD ----------------{{{
+set foldenable          " Allow fold
+set foldmethod=indent   " Fold contents by indent
+set foldlevel=2
+set fillchars+=foldopen:▽,foldsep:│,foldclose:▶
+let g:defaut_foldcolumn = ""
+if has('nvim')
+  let g:defaut_foldcolumn = "auto:5"
+else
+  let g:defaut_foldcolumn = 5
+endif
+let &foldcolumn = g:defaut_foldcolumn
+
+" }}}
 " ENCODING_PREFERENCE ----------------{{{
 
 if has('multi_byte')
@@ -135,13 +147,6 @@ if has('multi_byte')
 endif
 
 " }}}
-" FOLD ----------------{{{
-
-set foldenable          " Allow fold
-set foldmethod=indent   " Fold contents by indent
-set foldlevel=2
-
-" }}}
 " BACKUP ----------------{{{
 
 " Allow backup
@@ -162,13 +167,6 @@ set writebackup
 syntax enable
 set conceallevel=1
 
-function! GetHighlightGroupName()
-  let l:syntaxID = synID(line('.'), col('.'), 1)
-  let l:groupName = synIDattr(l:syntaxID, 'name')
-  echo "Highlight Group Name: " . l:groupName
-endfunction
-nnoremap <leader>H :call GetHighlightGroupName()<CR>
-
 " Defualt highlight for matched parenthesis is so weird in many colorscheme
 " Why the background color is lighter than my caret !?
 " highlight MatchParen ctermfg=NONE ctermbg=darkgrey cterm=NONE
@@ -178,14 +176,6 @@ highlight LuaParen ctermfg=NONE ctermbg=darkgrey cterm=NONE
 highlight ExtraWhitespace ctermbg=red guibg=red
 match ExtraWhitespace /\s\+$/
 
-" Persist visualized lines
-" define line highlight color
-highlight MultiLineHighlight ctermbg=LightYellow guibg=LightYellow ctermfg=Black guifg=Black
-" highlight the current line
-nnoremap <silent> <leader>gh :call matchadd('MultiLineHighlight', '\%'.line('.').'l')<CR>
-" clear all the highlighted lines
-nnoremap <silent> <leader>gH :call clearmatches()<CR>
-
 " }}}
 " MISC ----------------{{{