Update

2 files changed, 48 insertions, 113 deletions

diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index d94e7c0..37c0936 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -190,12 +190,53 @@ vnoremap Y "+y
 " Delete mark
 function! DeleteMark(mark)
   let mark = nr2char(a:mark)
-  if mark =~ '[a-z]'
+  if mark =~ '[a-Z]'
     execute "delmarks " . mark
   endif
-endfunction
+endfunc
 nnoremap dm :call DeleteMark(getchar())<CR>
 
+
+" Usage: z' to fold lines not near marks, use v:count to set bound
+"        For example: 15z'
+autocmd BufEnter * let b:unfold_marks = 0
+let g:mark_bound = 5
+function! ToggleFoldForMarks(bound)
+  let bound = a:bound ? a:bound : g:mark_bound
+  if !b:unfold_marks
+    mkview
+    setlocal foldmethod=manual
+    norm! zEgg
+
+    let line_list = []
+    for info in getmarklist(bufnr())
+      if match(info.mark, "[a-z]") == 1
+        call add(line_list, info.pos[1])
+      endif
+    endfor
+    echo line_list
+    call uniq(sort(line_list, 'n'))
+
+    for line in line_list
+      let foldstart = line('.')
+      let line_upper = line - bound
+      let line_lower = line + bound
+      if foldstart < (line_upper - 1)
+        exe foldstart..","..(line_upper-1).." fold"
+      endif
+      " Jump to lower bound of lineer
+      exe (line_lower + 1)
+    endfor
+    if line('.') < line('$')
+      norm! zfG
+    endif
+  else
+    loadview
+  endif
+  let b:unfold_marks = !b:unfold_marks
+endfunction
+nnoremap <expr> z' ":\<C-u>call ToggleFoldForMarks(".v:count..")\<CR>"
+
 "}}}
 " EDIT {{{
 
@@ -547,13 +588,13 @@ inoremap ( ()<Left>
 inoremap [ []<Left>
 inoremap { {}<Left>
 
-vnoremap ' <ESC>`<i'<ESC>`>la'<ESC>
 vnoremap q <ESC>`<i"<ESC>`>la"<ESC>
 vnoremap ( <ESC>`<i(<ESC>`>la)<ESC>
 vnoremap [ <ESC>`<i[<ESC>`>la]<ESC>
 vnoremap { <ESC>`<i{<ESC>`>la}<ESC>
-vnoremap ` <ESC>`<i`<ESC>`>la`<ESC>
 vnoremap Q <ESC>`<i「<ESC>`>la」<ESC>
+" vnoremap ' <ESC>`<i'<ESC>`>la'<ESC>
+" vnoremap ` <ESC>`<i`<ESC>`>la`<ESC>
 
 function! AddSpaceForSelection()
   " If visual selection by lines, add empty space at top and bottom
@@ -590,7 +631,7 @@ function! Redir(cmd)
     let output = system(matchstr(a:cmd, '^!\zs.*'))
   else
     redir => output
-    execute a:cmd
+    try | execute a:cmd | catch | return | redir END | endtry
     redir END
   endif
   enew
@@ -656,110 +697,3 @@ nnoremap <leader>dD :r !sh -c 'LANG=en zenity --calendar --date-format="\%a \%b
 nnoremap <leader>dt :r !date +\%H:\%m<CR>A
 
 " }}}
-" Tmp: Compile {{{
-
-" 编译运行 C/C++ 项目
-" 详细见：http://www.skywind.me/blog/archives/2084
-"----------------------------------------------------------------------
-
-" 自动打开 quickfix window ，高度为 6
-let g:asyncrun_open = 6
-
-" 任务结束时候响铃提醒
-let g:asyncrun_bell = 1
-
-" 设置 F10 打开/关闭 Quickfix 窗口
-nnoremap <F10> :call asyncrun#quickfix_toggle(6)<CR>
-
-" F9 编译 C/C++ 文件
-nnoremap <silent> <F9> :AsyncRun gcc -Wall -O2 "$(VIM_FILEPATH)" -o "$(VIM_FILEDIR)/$(VIM_FILENOEXT)" <CR>
-
-" F5 运行文件
-nnoremap <silent> <F5> :call ExecuteFile()<CR>
-
-" F7 编译项目
-nnoremap <silent> <F7> :AsyncRun -cwd=<root> make <CR>
-
-" F8 运行项目
-nnoremap <silent> <F8> :AsyncRun -cwd=<root> -raw make run <CR>
-
-" F6 测试项目
-nnoremap <silent> <F6> :AsyncRun -cwd=<root> -raw make test <CR>
-
-" 更新 cmake
-nnoremap <silent> <F4> :AsyncRun -cwd=<root> cmake . <CR>
-
-" Windows 下支持直接打开新 cmd 窗口运行
-if has('win32') || has('win64')
-  nnoremap <silent> <F8> :AsyncRun -cwd=<root> -mode=4 make run <CR>
-endif
-
-
-" F5 运行当前文件：根据文件类型判断方法，并且输出到 quickfix 窗口
-"----------------------------------------------------------------------
-function! ExecuteFile()
-  let cmd = ''
-  if index(['c', 'cpp', 'rs', 'go'], &ft) >= 0
-    " native 语言，把当前文件名去掉扩展名后作为可执行运行
-    " 写全路径名是因为后面 -cwd=? 会改变运行时的当前路径，所以写全路径
-    " 加双引号是为了避免路径中包含空格
-    let cmd = '"$(VIM_FILEDIR)/$(VIM_FILENOEXT)"'
-  elseif &ft == 'python'
-    let $PYTHONUNBUFFERED=1 " 关闭 python 缓存，实时看到输出
-    let cmd = 'python "$(VIM_FILEPATH)"'
-  elseif &ft == 'javascript'
-    let cmd = 'node "$(VIM_FILEPATH)"'
-  elseif &ft == 'perl'
-    let cmd = 'perl "$(VIM_FILEPATH)"'
-  elseif &ft == 'ruby'
-    let cmd = 'ruby "$(VIM_FILEPATH)"'
-  elseif &ft == 'php'
-    let cmd = 'php "$(VIM_FILEPATH)"'
-  elseif &ft == 'lua'
-    let cmd = 'lua "$(VIM_FILEPATH)"'
-  elseif &ft == 'zsh'
-    let cmd = 'zsh "$(VIM_FILEPATH)"'
-  elseif &ft == 'ps1'
-    let cmd = 'powershell -file "$(VIM_FILEPATH)"'
-  elseif &ft == 'vbs'
-    let cmd = 'cscript -nologo "$(VIM_FILEPATH)"'
-  elseif &ft == 'sh'
-    let cmd = 'bash "$(VIM_FILEPATH)"'
-  else
-    return
-  endif
-  " Windows 下打开新的窗口 (-mode=4) 运行程序，其他系统在 quickfix 运行
-  " -raw: 输出内容直接显示到 quickfix window 不匹配 errorformat
-  " -save=2: 保存所有改动过的文件
-  " -cwd=$(VIM_FILEDIR): 运行初始化目录为文件所在目录
-  if has('win32') || has('win64')
-    exec 'AsyncRun -cwd=$(VIM_FILEDIR) -raw -save=2 -mode=4 '. cmd
-  else
-    exec 'AsyncRun -cwd=$(VIM_FILEDIR) -raw -save=2 -mode=0 '. cmd
-  endif
-endfunc
-
-
-
-" F2 在项目目录下 Grep 光标下单词，默认 C/C++/Py/Js ，扩展名自己扩充
-" 支持 rg/grep/findstr ，其他类型可以自己扩充
-" 不是在当前目录 grep，而是会去到当前文件所属的项目目录 project root
-" 下面进行 grep，这样能方便的对相关项目进行搜索
-"----------------------------------------------------------------------
-if executable('rg')
-  noremap <silent><F2> :AsyncRun! -cwd=<root> rg -n --no-heading
-        \ --color never -g *.h -g *.c* -g *.py -g *.js -g *.vim
-        \ <C-R><C-W> "<root>" <CR>
-elseif has('win32') || has('win64')
-  noremap <silent><F2> :AsyncRun! -cwd=<root> findstr /n /s /C:"<C-R><C-W>"
-        \ "\%CD\%\*.h" "\%CD\%\*.c*" "\%CD\%\*.py" "\%CD\%\*.js"
-        \ "\%CD\%\*.vim"
-        \ <CR>
-else
-  noremap <silent><F2> :AsyncRun! -cwd=<root> grep -n -s -R <C-R><C-W>
-        \ --include='*.h' --include='*.c*' --include='*.py'
-        \ --include='*.js' --include='*.vim'
-        \ '<root>' <CR>
-endif
-
-" }}}
diff --git a/vim/mini.lua b/vim/mini.lua
index 7a5bcf8..01e0cf1 100644
--- a/vim/mini.lua
+++ b/vim/mini.lua
@@ -1,4 +1,4 @@
--- vim: sw=2 ts=2 et foldmethod=marker foldmarker={{{,}}} foldlevel=0
+-- vim: sw=2 et foldmethod=marker foldmarker={{{,}}} foldlevel=0
 
 -- Ref: https://github.com/echasnovski/mini.nvim
 --      https://lazy.folke.io/spec
@@ -785,6 +785,7 @@ require("mini.misc").setup({
 })
 vim.keymap.set( 'n', '<leader>Z', function()
   zoom()
+  vim.cmd("silent! call ToggleWinPadding()")
 end, { buffer = bufnr, desc = 'zoom' })
 --}}}
 -- mini.extra {{{