@@ -4,47 +4,45 @@

 """ Comments

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

-" be highlighted with

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

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

+" be highlighted with 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-fold.

+" Section headings are not written in the help |notation|, but are instead

+" indicated with multiple contiguous comment characters. They can form folds

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

 """ Compatibility

 " This vimrc should work with all configurations of Vim. Manually tested with:

 " - 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"`)

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

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

+" - UI: TUI, GUI (`{,g}vim`)

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

-" - Platforms: Linux

+" - Platforms: Unix-like

 """ Features

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

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

+" favor other features whenever possible. "Tiny" features include:

 " - |+multi_byte|

 " - |+mouse|

 " - |+tag_binary|

 " - |+user_commands|

 " - |+autocmd|

 " - |+localmap|

-" Important features that are only present in "normal":

-" - |+eval|

-" Note that trying to set unsupported options is silently ignored, and so can

-" be done without checking for support first (which is good, since that

-" requires |+eval|). Everything between |:if| and |:endif| is also silently

-" ignored if |+eval| is not available.

+" Note that trying to set (run-time, but not compile-time) unsupported options

+" is silently ignored, and so can be done without checking for support first

+" (which is good, since that requires |+eval|). Everything between |:if| and

+" |:endif| is also silently ignored if |+eval| is not available.

 """ Encoding

 " |'encoding'| is hard-coded to `utf-8`. However, only characters present in

 " Code Page 437 should be used in the interface, to ensure font support on most

 " terminals (in particular, the Linux console). See

-" - https://en.wikipedia.org/wiki/Code_page_347

+" - https://en.wikipedia.org/wiki/Code_page_437

 " - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/tty/vt/cp437.uni

 " - `man showconsolefont`

@@ -53,19 +51,21 @@

 " |setglobal| is used where appropriate so that buffer/window-local options are

 " not overridden when re-sourcing.

-" At the time of writing, |augroup| messes up the highlighting of |autocmd|s

-" within it, so the `vimrc` group name is added to every |autocmd| instead (the

-" addition of the group of course makes the highlighting misinterpret it as the

+" A `vimrc` |augroup| is cleared and used for all |autocmd|s. At the time of

+" writing, |augroup| messes up the highlighting of |autocmd|s within it, so the

+" `vimrc` group name is added to every |autocmd| instead (the addition of the

+" group of course makes the highlighting misinterpret it as the

 " `vimAutoEventList` and the events instead get the erroneous

-" `VimAutoCmdSfxList`... file a bug?). This can be checked with `:g/autocmd`.

+" `VimAutoCmdSfxList` highlighting... file a bug?). This can be checked with

+" `:g/autocmd`.

 """ Mappings

 " Don't make any built-in mappings do something completely different! Another

 " Vimmer should never be surprised by what happens, unless it is pleasantly

-" because the functionality is extended in useful and obvious ways. This

-" includes mappings from popular plugins, for which the defaults should be kept

-" as far as possible.

+" surprised because the functionality is extended in useful and obvious ways.

+" This includes mappings from popular plugins, for which the defaults should be

+" kept as far as possible.

 " |<Leader>| is hard-coded to <Space> so that mappings work without |+eval|.

 " Setting |mapleader| to a different value after the mappings have been defined

@@ -123,7 +123,7 @@ set showbreak=»\ |

 if has('gui_running')

   set t_Co=16777216

 endif

-if 16 <= &t_Co && &t_Co <= 256

+if 16 <= &t_Co && &t_Co <= 256 && !&termguicolors

   set t_Co=16

 endif

@@ -143,7 +143,7 @@ set mouse=a

 """ Command-line

 set wildmenu

 set wildmode=longest:full,full

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

+set wildignore=_*,.git,.cache,.vagrant,.ansible,.npm,node_modules,__pycache__,.venv,*.egg-info,pipx,snap

 if has('patch-8.2.4325')

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

   set wildoptions+=pum

@@ -172,6 +172,7 @@ endif

 """ Formatting

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

 set textwidth=79

+set winwidth=80

 " set colorcolumn=+1

 set autoindent

 set nojoinspaces

@@ -187,24 +188,29 @@ set commentstring=

 """ Folds

 set foldlevelstart=999

 set foldtext=substitute(getline(v:foldstart),'\\t',repeat('\ ',&ts),'g').'\ '

-if has('eval')

-  set foldtext=unobtrusive_fold#text()

-endif

 """ Spelling

 set spell

 set spelllang=en_us

-if has('eval')

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

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

-  let &thesaurus = split(&runtimepath, ',')[0] . '/thesaurus/en_us.txt'

-endif

+" `thesaurus/en_us.txt` downloaded from URL documented in |'thesaurus'|:

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

+set thesaurus=~/.vim/thesaurus/en_us.txt

 """ Views

 set viewoptions-=options

 set viewoptions+=slash

 set viewoptions+=unix

+""" Files

+set swapfile

+set writebackup

+set undofile

+set directory=~/.cache/vim/swap//

+set backupdir=~/.cache/vim/backup//

+set undodir=~/.cache/vim/undo//

+set viewdir=~/.cache/vim/view//

+set viminfofile=~/.cache/vim/viminfo

+

 "" Mappings

 """ Escape

@@ -224,13 +230,13 @@ 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>

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

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

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

 """ `$MYVIMRC`

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

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

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

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

 """ Help

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

@@ -239,29 +245,30 @@ xnoremap <silent> gK y:helpgrep <C-R>"<CR>

 """ Run

 " File.

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

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

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

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

 " Command.

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

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

 """ Make

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

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

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

-nnoremap <Space>mm :!make<CR>

-nnoremap <Space>ma :!make all<CR>

-nnoremap <Space>mt :!make test<CR>

-nnoremap <Space>md :!make debug<CR>

+" TODO: Should these be <silent> as well?

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

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

+nnoremap <Space><Space>mm :!make<CR>

+nnoremap <Space><Space>ma :!make all<CR>

+nnoremap <Space><Space>mt :!make test<CR>

+nnoremap <Space><Space>md :!make debug<CR>

 if has('quickfix')

-  nnoremap <Space>m% :silent make! %:r:S \| redraw!<CR>

-  nnoremap <Space>m# :silent make! #:r:S \| redraw!<CR>

-  nnoremap <Space>mm :silent make!       \| redraw!<CR>

-  nnoremap <Space>ma :silent make! all   \| redraw!<CR>

-  nnoremap <Space>mt :silent make! test  \| redraw!<CR>

+  nnoremap <Space><Space>m% :silent make! %:r:S \| redraw!<CR>

+  nnoremap <Space><Space>m# :silent make! #:r:S \| redraw!<CR>

+  nnoremap <Space><Space>mm :silent make!       \| redraw!<CR>

+  nnoremap <Space><Space>ma :silent make! all   \| redraw!<CR>

+  nnoremap <Space><Space>mt :silent make! test  \| redraw!<CR>

 endif

 if has('terminal')

-  nnoremap <Space>md :terminal make debug<CR>

+  nnoremap <Space><Space>md :terminal make debug<CR>

 endif

 """ Improve default mappings

@@ -325,7 +332,7 @@ endif

 """ Diffs

 " Current file.

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

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

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

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

@@ -357,8 +364,8 @@ nnoremap zV zMzv

 " Focus next/previous fold. Overwrites default move to start/end of

 " next/previous fold.

-nnoremap zj zvm<zjzvm>gvzc'>zv

-nnoremap zk zvzcVoVgkzvgkzvzcVoVzv

+nnoremap <silent> zj m<zjzvm>gvzc'>zv

+nnoremap <silent> zk zvzckVzvV:<C-R>=prevnonblank(line('.'))<CR><CR>zvzcVoVzv

 " Open/close nested folds recursively. Overwrites default open/close fold under

 " cursor recursively.

@@ -468,10 +475,6 @@ autocmd vimrc VimEnter,ColorScheme,OptionSet *

 \ highlight! SpellCap         term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=LightRed guifg=LightRed |

 \ highlight! Todo             term=bold cterm=bold gui=NONE ctermbg=NONE guibg=NONE ctermfg=White    guifg=White    |

-"""" Comments

-autocmd vimrc VimEnter,ColorScheme,OptionSet *

-\ highlight! Comment guifg=#919191 ctermfg=Grey

-

 """" Diffs

 autocmd vimrc VimEnter,ColorScheme,OptionSet *

 \ highlight! DiffAdd          term=NONE cterm=NONE gui=NONE ctermfg=Black guifg=Black ctermbg=DarkGreen  guibg=Green  |

@@ -481,6 +484,10 @@ autocmd vimrc VimEnter,ColorScheme,OptionSet *

 \ highlight! diffAdded        term=NONE cterm=NONE gui=NONE ctermbg=NONE  guibg=NONE  ctermfg=DarkGreen  guifg=Green  |

 \ highlight! diffRemoved      term=NONE cterm=NONE gui=NONE ctermbg=NONE  guibg=NONE  ctermfg=DarkRed    guifg=Red    |

+"""" Comments

+autocmd vimrc VimEnter,ColorScheme,OptionSet *

+\ highlight! Comment guifg=#919191 ctermfg=Grey

+

 """" Folds

 autocmd vimrc VimEnter,ColorScheme,OptionSet *

 \ highlight! link Folded Comment |

@@ -667,6 +674,7 @@ if has('eval')

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

   """" `qstrahl/vim-dentures`

+  " TODO: I'm not happy with this, replace.

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

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

@@ -735,12 +743,19 @@ if has('eval')

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

   GitAdd https://git.rcrnstn.net/rcrnstn/vim-unobtrusive-fold

+  " As suggested in |unobtrusive_fold#text()|.

+  set foldtext=unobtrusive_fold#text()

+

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

+  autocmd vimrc FileType *        UnobtrusiveFoldComment

+  autocmd vimrc FileType markdown UnobtrusiveFoldChar #

+

   """ Undo

   """" `mbbill/undotree`

   GitAdd https://github.com/mbbill/undotree

-  nnoremap <silent> <Space>u :UndotreeToggle<CR>

+  nnoremap <silent> <Space><Space>u :UndotreeToggle<CR>

   " let g:undotree_HighlightChangedText = 0

   " let g:undotree_DiffCommand = 'diff -u'

@@ -786,22 +801,22 @@ if has('eval')

   if has('unix')

     " TODO: Set `grepprg` to something similar, that skips things in

     " 'wildignore'.

-    " let g:ctrlp_user_command = 'find' .

-    " \ (g:ctrlp_follow_symlinks ? ' -L' : '') .

-    " \ ' %s' .

-    " \ ' -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' .

+    let g:ctrlp_user_command = 'find' .

+    \ (g:ctrlp_follow_symlinks ? ' -L' : '') .

+    \ ' %s' .

+    \ ' -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' .

+    \ ' 2> /dev/null' .

+    \ (g:ctrlp_max_files ? ' | head -n ' . g:ctrlp_max_files : '')

     " \ ' -exec grep -Il . {} +' .

-    " \ ' 2> /dev/null' .

-    " \ (g:ctrlp_max_files ? ' | head -n ' . g:ctrlp_max_files : '')

-    " " \ ' \(' .

-    " " \ (g:ctrlp_follow_symlinks == 2 ? ' -o -type l' : '') .

-    " " \ ' \)' .

+    " \ ' \(' .

+    " \ (g:ctrlp_follow_symlinks == 2 ? ' -o -type l' : '') .

+    " \ ' \)' .

   endif

   """" `tpope/vim-fugitive`

@@ -812,14 +827,18 @@ if has('eval')

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

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

+  """" `iberianpig/tig-explorer.vim`

+  " GitAdd https://github.com/iberianpig/tig-explorer.vim

+

   """" `tpope/vim-dispatch`

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

-  nnoremap <Space>m% :Make %:r:S<CR>

-  nnoremap <Space>m# :Make #:r:S<CR>

-  nnoremap <Space>mm :Make<CR>

-  nnoremap <Space>ma :Make all<CR>

-  nnoremap <Space>mt :Make test<CR>

+  " TODO: Stick to the default mappings.

+  nnoremap <Space><Space>m% :Make %:r:S<CR>

+  nnoremap <Space><Space>m# :Make #:r:S<CR>

+  nnoremap <Space><Space>mm :Make<CR>

+  nnoremap <Space><Space>ma :Make all<CR>

+  nnoremap <Space><Space>mt :Make test<CR>

   """" `tpope/vim-eunuch`

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

@@ -841,7 +860,7 @@ if has('eval')

   " Common DeBugGer Protocol (DBGP) client. See

   " https://en.wikipedia.org/wiki/DBGp.

-endif " has('eval')

+endif "" has('eval')

 "" Syntax and file type

 if has('eval')

@@ -863,17 +882,24 @@ autocmd vimrc FileType man

 autocmd vimrc FileType c,cpp

 \ setlocal commentstring=//\ %s

+autocmd vimrc FileType dot

+\ setlocal commentstring=//\ %s

+

+autocmd vimrc FileType markdown

+\ setlocal complete+=kspell

+

+autocmd vimrc FileType *

+\ if &buftype ==# 'nowrite' |

+\   setlocal nospell nolist |

+\ endif |

+

 " As suggested in |ft-syntax-omni|, use syntax completion if no other

 " completion has been defined.

 autocmd vimrc FileType *

-\ if &omnifunc == '' |

+\ if &omnifunc ==# '' |

 \   setlocal omnifunc=syntaxcomplete#Complete |

 \ endif |

-" As suggested in |unobtrusive-fold-example|.

-autocmd vimrc FileType *        UnobtrusiveFoldComment

-autocmd vimrc FileType markdown UnobtrusiveFoldChar #

-

 "" Terminal overrides

 " See |terminal-options|.