Update

2 files changed, 23 insertions, 20 deletions

diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index 09ed985..eb895e2 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -109,19 +109,19 @@ nnoremap gl :call ToggleQuit()<CR>
 " Simply exit when closing the last buffer
 
 function! Bye()
-    " Delete current buffer if working on special filetype
-    let specialFileTypes = ['help', 'netrw', 'vim-plug', 'nerdtree']
-    if index(specialFileTypes, &filetype) != -1
-        :bdelete
-    " Delete current buffer if more than one buffers
-    elseif len(getbufinfo(bufnr())[0].windows) == 1 && len(getwininfo()) > 1
-        :bdelete
-    elseif g:quitVimWhenPressingCtrlC
-        " Otherwise, quit vim
-        :silent! quit
+  let specialFileTypes = ['help', 'netrw', 'vim-plug', 'nerdtree']
+  let bufIsSpecial = index(specialFileTypes, &filetype) != -1
+  let bufInMultipleWindow = len(getbufinfo(bufnr())[0].windows) > 1
+
+  if len(getbufinfo({'buflisted': 1})) == 1 && len(getwininfo()) == 1
+    if g:quitVimWhenPressingCtrlC
+      :silent! quit
     else
-        :echo "Press gl to allow quit with <C-c>"
+      :echo "Press gl to allow quit with <C-c>"
     endif
+  else
+    :bdelete
+  endif
 endfunction
 
 " Ctrl-C rules!!!
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index da8ccd0..c57a57c 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -3,7 +3,7 @@
 " Only for key mapping
 "
 "   - COMMON_MAPPING
-"   - LINKS
+"   - MANAGE_VIMRC
 "   - MOVING_WITH_READLINE
 "   - INSERT_SURROUNDING
 "   - JUMP_TO_TABS_WITH_ALT
@@ -51,16 +51,14 @@ nmap <leader>q :cq<cr>
 " Switch wrap
 nmap <leader>W :set wrap!<cr>
 
+" Show fold level when it changes
+nnoremap zm zm:set foldlevel<CR>
+nnoremap zr zr:set foldlevel<CR>
+
 " :W sudo saves the file
 " (useful for handling the permission-denied error)
 command! W execute 'w !sudo -S tee %' <bar> edit!
 
-" New tab like browser
-nmap <C-t>n :tabnew<CR>
-nmap <C-t>c :tabclose<CR>
-nmap <C-t>m :tabmove
-nmap <C-t>o :tabonly
-
 " Enter to open file
 nnoremap <CR> gf
 nnoremap gF :e <cfile><CR>
@@ -126,7 +124,7 @@ vnoremap so :source<CR>
 
 
 "----------------------------------------------------------------------
-" => Fast editing and reloading of vimrc configs
+" MANAGE_VIMRC
 "----------------------------------------------------------------------
 nnoremap <leader>e :edit $MYVIMRC<CR>
 autocmd! bufwritepost $MYVIMRC source $MYVIMRC
@@ -205,9 +203,14 @@ inoremap <silent><M-9> <Esc>:tablast<CR>
 
 " Useful mappings for managing tabs
 map <leader>tn :tabnew<CR>
-map <leader>to :tabonly<CR>
 map <leader>tc :tabclose<CR>
 map <leader>tm :tabmove<SPACE>
+map <leader>to :tabonly<CR>
+nmap <C-t>n :tabnew<CR>
+nmap <C-t>c :tabclose<CR>
+nmap <C-t>m :tabmove
+nmap <C-t>o :tabonly
+
 noremap <silent><m-h> :call Tab_MoveLeft()<cr>
 noremap <silent><m-l> :call Tab_MoveRight()<cr>