@@ -6,11 +6,11 @@

 " Comments are written in Vim's help |notation|, see |help-writing|, which can

 " be highlighted with

-" https://git.rcrnstn.net/rcrnstn/vim-unobtrusive-vimcomments.

+" https://git.rcrnstn.net/rcrnstn/vim-unobtrusive-comment.

 " Section headings are not written in |notation|, but are instead indicated

 " with multiple comment characters, which can form folds with

-" https://git.rcrnstn.net/rcrnstn/vim-unobtrusive-folds.

+" https://git.rcrnstn.net/rcrnstn/vim-unobtrusive-fold.

 """ Compatibility

@@ -18,14 +18,14 @@

 " - Features: tiny, huge (Debian `apt-get install vim-{tiny,gtk3}`)

 " - Encodings/Locales: C, UTF-8 (`LC_ALL=C{,.UFT-8}`)

 " - Colors: 1, 2, 8, 16, 256, termguicolors (`--cmd "set t_Co=$colors"`)

-" - Terminals: GUI, VTE, Linux, tmux with the correct `Ss` terminal-override

+" - Terminals: GUI, VTE, Linux, tmux with the correct `Ss` `terminal-override`

 "   for the outer terminal

 " - Platforms: Linux

 """ Features

 " |:version| says "tiny" features are always present and are therefore used in

-" favor of more advanced features whenever possible. These include:

+" favor of more advanced features whenever possible. "Tiny" features include:

 " - |+multi_byte|

 " - |+mouse|

 " - |+tag_binary|

@@ -127,7 +127,11 @@ set mouse=a

 """ Command-line

 set wildmenu

 set wildmode=longest:full,full

-set wildignore=.git,_*,node_modules

+set wildignore=_*,.git,.cache,.vagrant,.ansible,.npm,node_modules,pipx,snap

+if has('patch-8.2.4325')

+  " See http://ftp.vim.org/pub/vim/patches/8.2/8.2.4325.

+  set wildoptions+=pum

+endif

 """ Search

 set incsearch

@@ -142,6 +146,12 @@ set ttimeoutlen=100

 """ Diffs

 set diffopt+=vertical

 set diffopt+=foldcolumn:0

+if has('patch-8.1.0360')

+  " See http://ftp.vim.org/pub/vim/patches/8.1/8.1.0360.

+  set diffopt+=internal

+  set diffopt+=algorithm:histogram

+  set diffopt+=indent-heuristic

+endif

 """ Formatting

 " See |auto-format|, |format-comments|, and |fo-table|.

@@ -161,7 +171,7 @@ set foldtext=substitute(getline(v:foldstart),'\\t',repeat('\ ',&ts),'g').'\ '

 """ Spelling

 set spell

-set spelllang=en_us " May my ancestors forgive me.

+set spelllang=en_us

 if has('eval')

   " Files downloaded from URL documented in |'thesaurus'|:

   " https://github.com/vim/vim/issues/629#issuecomment-443293282.

@@ -193,21 +203,29 @@ tnoremap <C-J> <C-W>j

 tnoremap <C-K> <C-W>k

 tnoremap <C-L> <C-W>l

+""" Buffers

+nnoremap <Space>bb :ls<CR>:b<Space>

+nnoremap <Space>bs :ls<CR>:sb<Space>

+nnoremap <Space>bv :ls<CR>:vertical sb<Space>

+

 """ `$MYVIMRC`

 nnoremap <silent> <Space>ve :edit   $MYVIMRC<CR>

 nnoremap <silent> <Space>vs :source $MYVIMRC<CR>

-""" Run command

-nnoremap <Space>! :new \| .!

+""" Help

+nnoremap <silent> gK  :helpgrep <C-R><C-W><CR>

+xnoremap <silent> gK y:helpgrep <C-R>"<CR>

+

+""" Run

-""" Run file

+" File.

 nnoremap <silent> <Space>% :!%:p:S<CR>

 nnoremap <silent> <Space># :!#:p:S<CR>

-""" Run `diff`

-nnoremap <silent> <Space>d :w !diff --color -u %:S -<CR>

+" Command.

+nnoremap <Space>! :new \| .!

-""" Run `make`

+""" Make

 " TODO: |dispatch| provides default mappings, try to emulate them?

 nnoremap <Space>m% :!make %:r:S<CR>

 nnoremap <Space>m# :!make #:r:S<CR>

@@ -236,12 +254,12 @@ nnoremap <silent> ZZ :quit<CR>

 nnoremap <silent> ZQ :quit<CR>

 """" Easier access to black hole register with U

-" This overrides the built-in "undo all on line". It is weird, counts as a

-" change, and nobody uses it anyway.

+" Overrides the built-in "undo all on line". It is weird, counts as a change,

+" and nobody uses it anyway.

 nnoremap U "_

 """"" Yank to end of line, not entire line

-" As suggested in |Y|. This is analogous with |D| does `d$` and |C| does `c$`.

+" As suggested in |Y|. Analogous with |D| does `d$` and |C| does `c$`.

 nnoremap Y y$

 """" Don't include newline in Visual mode `$`.

@@ -251,9 +269,9 @@ xnoremap $ $h

 xnoremap p pgvy

 """" Visually select last pasted text

-" This is analogous with how |gv| visually selects last visually selected

-" text. Default to always using ordinary Visual mode. Linewise and blockwise

-" with |+eval| support.

+" Analogous with how |gv| visually selects last visually selected text. Default

+" to always using ordinary Visual mode. Linewise and blockwise with |+eval|

+" support.

 nnoremap gp `[v`]

 if has('eval')

   nnoremap <expr> gp '`[' . getregtype()[0] . '`]'

@@ -285,6 +303,27 @@ if has('eval')

   endfunction

 endif

+""" Diffs

+

+" Current file.

+nnoremap <silent> <Space>dd :w !diff --color -u %:S -<CR>

+

+" Analogous with |dp| |do| in Normal mode.

+nnoremap <silent> <Space>dpp :.diffput<CR>

+nnoremap <silent> <Space>doo :.diffget<CR>

+xnoremap <silent> <Space>dp  :diffput<CR>

+xnoremap <silent> <Space>do  :diffget<CR>

+nnoremap <silent> <Space>dp  :set operatorfunc=<SID>diffput<CR>g@

+nnoremap <silent> <Space>do  :set operatorfunc=<SID>diffget<CR>g@

+if has('eval')

+  function! s:diffput(...) abort

+    '[,']diffput

+  endfunction

+  function! s:diffget(...) abort

+    '[,']diffget

+  endfunction

+endif

+

 """ Formatting

 " Format comment (only). NOTE that this requires a `gc` comment text object

@@ -292,6 +331,9 @@ endif

 nmap gQ gqgc

 nmap gW gwgc

+""" Comments

+set commentstring=

+

 """ Folds

 " Focus current fold.

@@ -341,7 +383,7 @@ augroup END

 "" Auto commands

-""" Open the quickfix/location list window automatically.

+""" Open the QuickFix/Location list window automatically.

 " See

 " - https://github.com/tpope/vim-dispatch/issues/145

 " - https://github.com/tpope/vim-dispatch/issues/254

@@ -373,7 +415,7 @@ autocmd BufWinLeave *

 """ Defaults

 " See |:hi-normal|, |:hi-normal-cterm|.

-"""" Dark background and light foreground.

+" Dark background and light foreground.

 set background=dark

 highlight! Normal guibg=#303030 guifg=#c6c6c6 ctermfg=White

@@ -466,21 +508,26 @@ if has('eval')

   """ Built-in `vim`

+  " See |ft-vim-indent|.

   let g:vim_indent_cont = 0

+  """ Built-in `sh`

+

+  " See |ft-sh-syntax|.

+  let g:is_posix = 1

+

   """ Built-in `man`

+  " See |ft-man-plugin|.

   let g:ft_man_folding_enable = 1

   runtime ftplugin/man.vim

   set keywordprg=:Man

-  """ Built-in `markdown`

-

-  let g:vim_markdown_no_default_key_mappings = 1

-

   """ `sheerun/vim-polyglot`

   PackAdd https://github.com/sheerun/vim-polyglot

+  let g:vim_markdown_no_default_key_mappings = 1

+

   let g:polyglot_disabled = [

   \   'sensible',

   \   'autoindent',

@@ -495,6 +542,9 @@ if has('eval')

   """ `tpope/vim-scriptease`

   PackAdd https://github.com/tpope/vim-scriptease

+  """ `jyscao/vim-greprtpscr`

+  PackAdd https://github.com/jyscao/vim-greprtpscr

+

   """ `vimwiki/vimwiki`

   " PackAdd https://github.com/vimwiki/vimwiki

@@ -533,11 +583,35 @@ if has('eval')

   map <silent> zg* <Plug>(asterisk-gz*):set hlsearch<CR>

   map <silent> zg# <Plug>(asterisk-gz#):set hlsearch<CR>

+  """ `AndrewRadev/splitjoin.vim`

+  PackAdd https://github.com/AndrewRadev/splitjoin.vim

+

+  """ `AndrewRadev/switch.vim`

+  PackAdd https://github.com/AndrewRadev/switch.vim

+

+  let g:switch_custom_definitions = [{

+  \   '\<0\>': '1',

+  \   '\<1\>': '0',

+  \   '\(\w*\)TRUE\(\w*\)': '\1FALSE\2',

+  \   '\(\w*\)True\(\w*\)': '\1False\2',

+  \   '\(\w*\)true\(\w*\)': '\1false\2',

+  \   '\(\w*\)FALSE\(\w*\)': '\1TRUE\2',

+  \   '\(\w*\)False\(\w*\)': '\1True\2',

+  \   '\(\w*\)false\(\w*\)': '\1true\2',

+  \ }]

+

   "" Insert mode

   """ `tpope/vim-endwise`

   PackAdd https://github.com/tpope/vim-endwise

+  """ `jiangmiao/auto-pairs`

+  PackAdd https://github.com/jiangmiao/auto-pairs

+

+  " Don't jump around too much. See |autopairs-options|.

+  let g:AutoPairsCenterLine = 0

+  let g:AutoPairsMultilineClose = 0

+

   "" Command-line mode

   """ `tpope/vim-rsi`

@@ -557,34 +631,53 @@ if has('eval')

   """ `tommcdo/vim-lion`

   PackAdd https://github.com/tommcdo/vim-lion

+  let g:lion_squeeze_spaces = 1

+

+  """ `tommcdo/vim-nowchangethat`

+  PackAdd https://github.com/tommcdo/vim-nowchangethat

+

   "" Motions / text objects

   """ `wellle/targets.vim`

   PackAdd https://github.com/wellle/targets.vim

+  """ `bkad/CamelCaseMotion`

+  PackAdd https://github.com/bkad/CamelCaseMotion

+

+  let g:camelcasemotion_key = '<Space>'

+

+  """ `tommcdo/vim-exchange`

+  PackAdd https://github.com/tommcdo/vim-exchange

+

   """ `qstrahl/vim-dentures`

   PackAdd https://github.com/qstrahl/vim-dentures

   """ `kana/vim-textobj-user`

   PackAdd https://github.com/kana/vim-textobj-user

+  """ `kana/vim-textobj-entire`

+  PackAdd https://github.com/kana/vim-textobj-entire

+

   """ `kana/vim-textobj-line`

   PackAdd https://github.com/kana/vim-textobj-line

+  " As suggested in |textobj-line-default-key-mappings|, except `{a,i}l` is

+  " taken by `targets` "last", so we use uppercase `{a,i}L`.

+  let g:textobj_line_no_default_key_mappings = 1

+  omap aL <Plug>(textobj-line-a)

+  omap iL <Plug>(textobj-line-i)

+  xmap aL <Plug>(textobj-line-a)

+  xmap iL <Plug>(textobj-line-i)

+

   """ `kana/vim-textobj-fold`

   PackAdd https://github.com/kana/vim-textobj-fold

+  """ `kana/vim-textobj-syntax`

+  PackAdd https://github.com/kana/vim-textobj-syntax

+

   """ `idbrii/textobj-word-column.vim`

   PackAdd https://github.com/idbrii/textobj-word-column.vim

-  """ `bkad/CamelCaseMotion`

-  PackAdd https://github.com/bkad/CamelCaseMotion

-

-  let g:camelcasemotion_key = '<Space>'

-

-  """ `tommcdo/vim-exchange`

-  PackAdd https://github.com/tommcdo/vim-exchange

-

   "" Colors

   """ `gruvbox-community/gruvbox`

@@ -607,12 +700,13 @@ if has('eval')

   "" Folds

-  """ `rcrnstn/vim-unobtrusive-foldexpr`

-  PackAdd https://git.rcrnstn.net/rcrnstn/vim-foldexpr-unobtrusive

+  """ `rcrnstn/vim-unobtrusive-fold`

+  PackAdd https://git.rcrnstn.net/rcrnstn/vim-unobtrusive-fold

-  " autocmd vimrc VimEnter *        set commentstring=

-  " autocmd vimrc FileType *        call foldexpr_unobtrusive#commentstring(&commentstring)

-  " autocmd vimrc FileType markdown call foldexpr_unobtrusive#char('#')

+  "" Undo

+

+  """ `mbbill/undotree`

+  PackAdd https://github.com/mbbill/undotree

   "" QuickFix

@@ -620,27 +714,45 @@ if has('eval')

   packadd! cfilter

+  "" Modelines

+

+  """ `ypcrts/securemodelines`

+  PackAdd https://github.com/ypcrts/securemodelines

+

   "" Operating system interaction

   """ `ctrlpvim/ctrlp.vim`

   PackAdd https://github.com/ctrlpvim/ctrlp.vim

-  let g:ctrlp_use_caching = 0

-  let g:ctrlp_working_path_mode = 'a'

+  let g:ctrlp_working_path_mode = ''

+  let g:ctrlp_match_current_file = 1

   let g:ctrlp_follow_symlinks = 1

+  let g:ctrlp_show_hidden = 1

   let g:ctrlp_status_func = ''

   let g:ctrlp_line_prefix = ''

+  let g:ctrlp_use_caching = 0

+  let g:ctrlp_max_files = 10000 " Default 10000.

+  let g:ctrlp_max_depth = 40 " Default 40.

   if has('unix')

     let g:ctrlp_user_command = 'find -L %s' .

-    \ ' \( -false' .

-    \ join(map(split(&wildignore, ','), '" -o -name " . shellescape(v:val)')) .

+    \ ' -maxdepth ' . g:ctrlp_max_depth .

+    \ ' \( -false ' .

+    \ (g:ctrlp_show_hidden ? '' : '-o -name ".*" ') .

+    \ join(map(split(&wildignore, ','), '"-o -name " . shellescape(v:val)')) .

     \ ' \) -prune' .

-    \ ' -o -type f -exec grep -Il . {} +'

+    \ ' -o -type f -exec grep -Il . {} +' .

+    \ ' 2> /dev/null' .

+    \ ' | head -n ' . g:ctrlp_max_files

   endif

   """ `tpope/vim-fugitive`

   PackAdd https://github.com/tpope/vim-fugitive

+  autocmd vimrc FileType fugitiveblame call fugitive#MapJumps()

+

+  """ `tommcdo/vim-fugitive-blame-ext`

+  PackAdd https://github.com/tommcdo/vim-fugitive-blame-ext

+

   """ `tpope/vim-dispatch`

   PackAdd https://github.com/tpope/vim-dispatch

@@ -653,6 +765,9 @@ if has('eval')

   """ `tpope/vim-eunuch`

   PackAdd https://github.com/tpope/vim-eunuch

+  """ `tpope/vim-projectionist`

+  PackAdd https://github.com/tpope/vim-projectionist

+

   "" Debugging

   """ `puremourning/vimspector`

@@ -684,9 +799,18 @@ autocmd vimrc FileType *

 \   setlocal omnifunc=syntaxcomplete#Complete |

 \ endif |

+" As suggested in |unobtrusive-fold-config|.

+" autocmd vimrc FileType *        UnobtrusiveFoldComment

+" autocmd vimrc FileType markdown UnobtrusiveFoldChar #

+" autocmd vimrc FileType *        call foldexpr_unobtrusive#commentstring(&commentstring)

+" autocmd vimrc FileType markdown call foldexpr_unobtrusive#char('#')

+

 autocmd vimrc FileType vim

 \ setlocal formatoptions-=r

+autocmd vimrc FileType help

+\ setlocal nolist

+

 autocmd vimrc FileType man

 \ setlocal nolist