4 files changed, 15 insertions, 17 deletions

diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index b74f988..945c134 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -113,10 +113,6 @@ nnoremap gl :call ToggleQuit()<CR>
 " Simply exit when closing the last buffer
 
 function! Bye()
-  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
diff --git a/vim/init/config.vim b/vim/init/config.vim
index f15c5a8..39f1c12 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -7,6 +7,13 @@
 "
 "======================================================================
 
+"----------------------------------------------------------------------
+"
+"----------------------------------------------------------------------
+augroup LeavingBuffer!
+  au BufLeave {} if getline(1, '$') == [''] | setlocal bufhidden=wipe | endif
+augroup END
+
 
 "----------------------------------------------------------------------
 " 有 tmux 何没有的功能键超时（毫秒）
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index e4bdfd4..504d071 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -289,11 +289,11 @@ vnoremap Q <ESC>`<i「<ESC>`>la」<ESC>
 "       :Redir !ls -al ........ show the full output of command ':!ls -al' in a scratch window
 "
 function! Redir(cmd)
-  for win in range(1, winnr('$'))
-    if getwinvar(win, 'scratch')
-      execute win . 'windo close'
-    endif
-  endfor
+  " for win in range(1, winnr('$'))
+  "   if getwinvar(win, 'scratch')
+  "     execute win . 'windo close'
+  "   endif
+  " endfor
   if a:cmd =~ '^!'
     let output = system(matchstr(a:cmd, '^!\zs.*'))
   else
@@ -308,7 +308,7 @@ function! Redir(cmd)
 endfunction
 
 command! -nargs=1 -complete=command Redir silent call Redir(<q-args>)
-nnoremap <leader>rr :Redir
+nnoremap <leader>rr :Redir<space>
 
 
 "----------------------------------------------------------------------
diff --git a/vim/lua/chadrc.lua b/vim/lua/chadrc.lua
index aa9a78c..4efa204 100644
--- a/vim/lua/chadrc.lua
+++ b/vim/lua/chadrc.lua
@@ -13,19 +13,14 @@ M.ui = {
   -- },
   tabufline = {
     enabled = true,
+    order = { "treeOffset", "buffers", "tabs" },
   },
 }
 
 -- For tabufline
 if M.ui.tabufline.enabled then
   vim.keymap.set("n", "<C-c>", function()
-    local bufnrs = vim.tbl_filter(function(b)
-      if 1 ~= vim.fn.buflisted(b) then
-        return false
-      else
-        return true
-      end
-    end, vim.api.nvim_list_bufs())
+    local bufnrs = vim.tbl_filter(function(b) return 1 == vim.fn.buflisted(b) end, vim.api.nvim_list_bufs())
     if #bufnrs == 1 then
       vim.cmd("silent quit!")
     else