@@ -120,6 +120,7 @@ set listchars=tab:├\ ┤,trail:•,extends:›,precedes:‹,nbsp:·

 set showbreak=»\ |

 """ Colors

+set background=dark

 if has('gui_running')

   set t_Co=16777216

 endif

@@ -430,27 +431,20 @@ autocmd vimrc BufWinLeave *

 \ endif |

 """ Don't show extra things in special buffers

+" TODO: This needs to be moved to after the plugins for it to work in e.g.

+" fugitive?

 autocmd vimrc WinEnter,TerminalWinOpen *

 \ if &buftype !=# '' |

 \   silent setlocal nolist nospell |

 \ endif

 "" Colors

-" See |cterm-colors|, |gui-colors|. The greyscale hex values used for the GUI

-" are CIELCHuv lightness 20, 60 and 80.

-

-""" Defaults

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

-

-" Dark background and light foreground.

-set background=dark

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

+" See |cterm-colors|, |gui-colors|.

 """ Overrides

-

-"""" Transparency

-" Greyscale interface, dark red errors/warnings, light red spelling errors,

-" bold white todos.

+" Transparent background, greyscale interface. Sensible errors/warnings,

+" spellchecking, diffs, comments, and todos. See |:hi-normal| and

+" |:hi-normal-cterm|.

 if !has('gui_running')

   autocmd vimrc VimEnter,ColorScheme *

@@ -458,54 +452,46 @@ if !has('gui_running')

 endif

 " TODO: Look at all in |'highlight'|.

-" TODO: If we decide that we want `OptionSet` here as well, make these commands

-" |silent| as they clear the command line row otherwise.

-autocmd vimrc VimEnter,ColorScheme *

-\ highlight! Normal           term=NONE cterm=NONE gui=NONE ctermbg=NONE |

-\ highlight! LineNr           term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=Grey     guifg=Grey     |

-\ highlight! FoldColumn       term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=Grey     guifg=Grey     |

-\ highlight! SignColumn       term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=Grey     guifg=Grey     |

-\ highlight! VertSplit        term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=Grey     guifg=Grey     |

-\ highlight! StatusLine       term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=White    guifg=White    |

-\ highlight! StatusLineNC     term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=Grey     guifg=Grey     |

-\ highlight! StatusLineTerm   term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=White    guifg=White    |

-\ highlight! StatusLineTermNC term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=Grey     guifg=Grey     |

-\ highlight! TabLine          term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=Grey     guifg=Grey     |

-\ highlight! TabLineFill      term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=Grey     guifg=Grey     |

-\ highlight! TabLineSel       term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=White    guifg=White    |

-\ highlight! EndOfBuffer      term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=Black    guifg=Black    |

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

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

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

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

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

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

-\ 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    |

-

-"""" Diffs

 autocmd vimrc VimEnter,ColorScheme *

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

-\ highlight! DiffDelete       term=NONE cterm=NONE gui=NONE ctermfg=Black guifg=Black ctermbg=DarkRed    guibg=Red    |

-\ highlight! DiffChange       term=NONE cterm=NONE gui=NONE ctermfg=Black guifg=Black ctermbg=DarkBlue   guibg=Blue   |

-\ highlight! DiffText         term=NONE cterm=NONE gui=NONE ctermfg=Black guifg=Black ctermbg=DarkYellow guibg=Yellow |

-\ 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

+\ highlight! Normal           term=NONE cterm=NONE gui=NONE ctermbg=NONE                    ctermfg=White                    |

+\ highlight! Comment          term=NONE cterm=NONE gui=NONE ctermbg=NONE       guibg=NONE   ctermfg=Grey                     |

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

+\ highlight! LineNr           term=NONE cterm=NONE gui=NONE ctermbg=NONE       guibg=NONE   ctermfg=Grey      guifg=Grey     |

+\ highlight! FoldColumn       term=NONE cterm=NONE gui=NONE ctermbg=NONE       guibg=NONE   ctermfg=Grey      guifg=Grey     |

+\ highlight! SignColumn       term=NONE cterm=NONE gui=NONE ctermbg=NONE       guibg=NONE   ctermfg=Grey      guifg=Grey     |

+\ highlight! VertSplit        term=NONE cterm=NONE gui=NONE ctermbg=NONE       guibg=NONE   ctermfg=Grey      guifg=Grey     |

+\ highlight! StatusLine       term=NONE cterm=NONE gui=NONE ctermbg=NONE       guibg=NONE   ctermfg=White     guifg=White    |

+\ highlight! StatusLineNC     term=NONE cterm=NONE gui=NONE ctermbg=NONE       guibg=NONE   ctermfg=Grey      guifg=Grey     |

+\ highlight! StatusLineTerm   term=NONE cterm=NONE gui=NONE ctermbg=NONE       guibg=NONE   ctermfg=White     guifg=White    |

+\ highlight! StatusLineTermNC term=NONE cterm=NONE gui=NONE ctermbg=NONE       guibg=NONE   ctermfg=Grey      guifg=Grey     |

+\ highlight! TabLine          term=NONE cterm=NONE gui=NONE ctermbg=NONE       guibg=NONE   ctermfg=Grey      guifg=Grey     |

+\ highlight! TabLineFill      term=NONE cterm=NONE gui=NONE ctermbg=NONE       guibg=NONE   ctermfg=Grey      guifg=Grey     |

+\ highlight! TabLineSel       term=NONE cterm=NONE gui=NONE ctermbg=NONE       guibg=NONE   ctermfg=White     guifg=White    |

+\ highlight! EndOfBuffer      term=NONE cterm=NONE gui=NONE ctermbg=NONE       guibg=NONE   ctermfg=Black     guifg=Black    |

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

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

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

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

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

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

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

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

+\ highlight! DiffDelete       term=NONE cterm=NONE gui=NONE ctermbg=DarkRed    guibg=Red    ctermfg=Black     guifg=Black    |

+\ highlight! DiffChange       term=NONE cterm=NONE gui=NONE ctermbg=DarkBlue   guibg=Blue   ctermfg=Black     guifg=Black    |

+\ highlight! DiffText         term=NONE cterm=NONE gui=NONE ctermbg=DarkYellow guibg=Yellow ctermfg=Black     guifg=Black    |

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

+

+""" |'listchars'|

 autocmd vimrc VimEnter,ColorScheme *

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

+\ highlight! link SpecialKey Special |

+\ highlight! link NonText    Special |

-"""" Folds

+""" Folds

 autocmd vimrc VimEnter,ColorScheme *

 \ highlight! link Folded Comment |

-"""" |'listchars'|

-autocmd vimrc VimEnter,ColorScheme *

-\ highlight! link SpecialKey Special |

-\ highlight! link NonText    Special |

-

-"""" Vim comments

+""" Vim comments

 autocmd vimrc VimEnter,ColorScheme *

 \ highlight! link vimCommentString vimComment |

 \ highlight! link vimCommentTitle  vimComment |

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

 """ Run

 " File.

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

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

+nnoremap <silent> <Space><Space>% :!%:p:S \| less -FR<CR>

+nnoremap <silent> <Space><Space># :!#:p:S \| less -FR<CR>

 " Command.

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

@@ -254,12 +254,12 @@ nnoremap <Space><Space>! :new \| .!

 """ Make

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

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

+nnoremap <Space><Space>m% :!make %:r:S \| less -FR<CR>

+nnoremap <Space><Space>m# :!make #:r:S \| less -FR<CR>

+nnoremap <Space><Space>mm :!make       \| less -FR<CR>

+nnoremap <Space><Space>ma :!make all   \| less -FR<CR>

+nnoremap <Space><Space>mt :!make test  \| less -FR<CR>

+nnoremap <Space><Space>md :!make debug \| less -FR<CR>

 if has('quickfix')

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

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

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

 """ Diffs

 " Current file.

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

+nnoremap <silent> <Space><Space>dd :w !diff --color=always -u %:S - \| less -FR<CR>

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

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

@@ -429,6 +429,12 @@ autocmd vimrc BufWinLeave *

 \   mkview |

 \ endif |

+""" Don't show extra things in special buffers

+autocmd vimrc WinEnter,TerminalWinOpen *

+\ if &buftype !=# '' |

+\   silent setlocal nolist nospell |

+\ endif

+

 "" Colors

 " See |cterm-colors|, |gui-colors|. The greyscale hex values used for the GUI

 " are CIELCHuv lightness 20, 60 and 80.

@@ -447,12 +453,14 @@ highlight! Normal guibg=#303030 guifg=#c6c6c6 ctermfg=White

 " bold white todos.

 if !has('gui_running')

-  autocmd vimrc VimEnter,ColorScheme,OptionSet *

+  autocmd vimrc VimEnter,ColorScheme *

   \ highlight! Normal guibg=NONE |

 endif

 " TODO: Look at all in |'highlight'|.

-autocmd vimrc VimEnter,ColorScheme,OptionSet *

+" TODO: If we decide that we want `OptionSet` here as well, make these commands

+" |silent| as they clear the command line row otherwise.

+autocmd vimrc VimEnter,ColorScheme *

 \ highlight! Normal           term=NONE cterm=NONE gui=NONE ctermbg=NONE |

 \ highlight! LineNr           term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=Grey     guifg=Grey     |

 \ highlight! FoldColumn       term=NONE cterm=NONE gui=NONE ctermbg=NONE guibg=NONE ctermfg=Grey     guifg=Grey     |

@@ -476,7 +484,7 @@ autocmd vimrc VimEnter,ColorScheme,OptionSet *

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

 """" Diffs

-autocmd vimrc VimEnter,ColorScheme,OptionSet *

+autocmd vimrc VimEnter,ColorScheme *

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

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

 \ highlight! DiffChange       term=NONE cterm=NONE gui=NONE ctermfg=Black guifg=Black ctermbg=DarkBlue   guibg=Blue   |

@@ -485,20 +493,20 @@ autocmd vimrc VimEnter,ColorScheme,OptionSet *

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

 """" Comments

-autocmd vimrc VimEnter,ColorScheme,OptionSet *

+autocmd vimrc VimEnter,ColorScheme *

 \ highlight! Comment guifg=#919191 ctermfg=Grey

 """" Folds

-autocmd vimrc VimEnter,ColorScheme,OptionSet *

+autocmd vimrc VimEnter,ColorScheme *

 \ highlight! link Folded Comment |

 """" |'listchars'|

-autocmd vimrc VimEnter,ColorScheme,OptionSet *

+autocmd vimrc VimEnter,ColorScheme *

 \ highlight! link SpecialKey Special |

 \ highlight! link NonText    Special |

 """" Vim comments

-autocmd vimrc VimEnter,ColorScheme,OptionSet *

+autocmd vimrc VimEnter,ColorScheme *

 \ highlight! link vimCommentString vimComment |

 \ highlight! link vimCommentTitle  vimComment |

@@ -565,7 +573,7 @@ if has('eval')

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

   """" `jyscao/vim-greprtpscr`

-  GitAdd https://github.com/jyscao/vim-greprtpscr

+  GitAdd! https://github.com/jyscao/vim-greprtpscr

   """" `vimwiki/vimwiki`

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

@@ -873,12 +881,6 @@ endif

 autocmd vimrc FileType vim

 \ setlocal keywordprg=:help formatoptions-=r

-autocmd vimrc FileType help

-\ setlocal nolist

-

-autocmd vimrc FileType man

-\ setlocal nolist

-

 autocmd vimrc FileType c,cpp

 \ setlocal commentstring=//\ %s

@@ -888,10 +890,8 @@ autocmd vimrc FileType dot

 autocmd vimrc FileType markdown

 \ setlocal complete+=kspell

-autocmd vimrc FileType *

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

-\   setlocal nospell nolist |

-\ endif |

+autocmd vimrc FileType man

+\ setlocal nolist nospell

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

 " completion has been defined.

@@ -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|.

@@ -19,7 +19,6 @@

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

-"   for the outer terminal

 " - Platforms: Linux

 """ Features

@@ -35,8 +34,6 @@

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

 " - |+eval|

-" |<Leader>| is hard-coded to <Space> so that mappings work without |+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

@@ -51,15 +48,33 @@

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

 " - `man showconsolefont`

-""" Auto commands

+""" Re-sourcing

+

+" |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

 " `vimAutoEventList` and the events instead get the erroneous

-" `VimAutoCmdSfxList`... file a bug?). Don't forget!

+" `VimAutoCmdSfxList`... 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.

+

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

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

+" does not change the mappings, so it is not possible to "hot-swap" it for pair

+" programming anyway.

 "" Options

+" TODO: Use |setglobal| for more things? Note that for options with a non-empty

+" default local value, `setglobal` does nothing useful.

 """ Reset

 " set all&

@@ -93,8 +108,9 @@ set guioptions=cf

 """ Interface characters

 " If |'t_Co'| is empty (or set to 1) the default behavior of |'fillchars'|

-" `stl`/`stlnc` (`=`/`^`) will be used regardless of its setting. Other good

-" choices for |'listchars'| `tab` is: `→ `, `――>`, `├──`, `──┤`, `├─┤`.

+" `stl:`/`stlnc:` (`=`/`^`) will be used regardless of its setting. Other good

+" choices for |'listchars'| `fold:` is ` ` and `tab:` is: `→ `, `――>`, `├──`,

+" `──┤`, `├─┤`.

 set list

 set linebreak

 set breakindent

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

 if has('gui_running')

   set t_Co=16777216

 endif

-if &t_Co > 16

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

   set t_Co=16

 endif

@@ -160,14 +176,20 @@ set textwidth=79

 set autoindent

 set nojoinspaces

 set formatoptions-=t

-set formatoptions-=r

-set formatoptions+=j

+set formatoptions+=q

 set formatoptions+=n

+set formatoptions+=j

 set nowrap

+""" Comments

+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

@@ -179,9 +201,7 @@ if has('eval')

 endif

 """ Views

-set viewoptions-=folds

 set viewoptions-=options

-set viewoptions-=curdir

 set viewoptions+=slash

 set viewoptions+=unix

@@ -213,7 +233,7 @@ nnoremap <silent> <Space>ve :edit   $MYVIMRC<CR>

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

 """ Help

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

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

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

 """ Run

@@ -253,12 +273,7 @@ endif

 nnoremap <silent> ZZ :quit<CR>

 nnoremap <silent> ZQ :quit<CR>

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

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

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

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

 nnoremap Y y$

@@ -269,6 +284,7 @@ xnoremap $ $h

 xnoremap p pgvy

 """" Visually select last pasted text

+" TODO: Make a text object as well?

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

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

 " support.

@@ -285,6 +301,9 @@ xnoremap <Space>s :s/\%V

 noremap <MouseUp>   <C-E>

 noremap <MouseDown> <C-Y>

+" Toggle folds.

+noremap <RightMouse> <LeftMouse>za

+

 """ Command-line

 " Take already written text into account when searching history.

 cnoremap <C-P> <Up>

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

 nmap gQ gqgc

 nmap gW gwgc

-""" Comments

-set commentstring=

-

 """ Folds

 " Focus current fold.

@@ -375,35 +391,33 @@ if has('eval')

   endfunction

 endif

-"" Auto command group

+"" Auto commands

 " Make sure to not define any |autocmd|s before this!

 augroup vimrc

   autocmd!

 augroup END

-"" Auto commands

-

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

+""" Open the QuickFix/Location list window

 " See

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

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

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

-" autocmd QuickFixCmdPost  *{make,{,vim}grep}* nested botright cwindow

-" autocmd QuickFixCmdPost *l{make,{,vim}grep}* nested botright lwindow

+" autocmd vimrc QuickFixCmdPost  *{make,{,vim}grep}* nested botright cwindow

+" autocmd vimrc QuickFixCmdPost *l{make,{,vim}grep}* nested botright lwindow

-""" Highlight searches

+""" Highlight all searches

 " |'incsearch'| only highlights the first match.

-autocmd vimrc CmdlineEnter /,\? set hlsearch

-autocmd vimrc CmdlineLeave /,\? set nohlsearch

+autocmd vimrc CmdlineEnter /,\? let s:hlsearch =  &hlsearch | set hlsearch

+autocmd vimrc CmdlineLeave /,\? let  &hlsearch = s:hlsearch

 """ Save/load view

 " As suggested in |:loadview|, load auto-saved view when opening buffer. Better

 " than |last-position-jump|, |restore-cursor|.

-autocmd BufWinEnter *

+autocmd vimrc BufWinEnter *

 \ if !empty(expand('<afile>')) && empty(&buftype) |

 \   loadview |

 \ endif |

-autocmd BufWinLeave *

+autocmd vimrc BufWinLeave *

 \ if !empty(expand('<afile>')) && empty(&buftype) |

 \   mkview |

 \ endif |

@@ -485,46 +499,47 @@ autocmd vimrc VimEnter,ColorScheme,OptionSet *

 if has('eval')

-  "" Package manager

+  """ GitAdd

+  " https://git.rcrnstn.net/rcrnstn/vim-gitadd

-  " Make sure to not enable file type detection (|:syntax|, |:filetype|) until

-  " after all calls to `PackAdd` have been issued! See |:packadd|.

-  command! -bar -bang -nargs=1 PackAdd call s:PackAdd(<q-bang>, <f-args>)

-  function! s:PackAdd(bang, url) abort

+  " Make sure to not enable |:syntax| and |:filetype| until all plugins that

+  " interact with them have been added! See |:packadd|.

+  command! -bar -bang -nargs=+ GitAdd call s:GitAdd(<q-bang>, <f-args>)

+  function! s:GitAdd(bang, url, ...) abort

     let name = split(a:url, '/')[-1]

-    let dir = split(&packpath, ',')[0] . '/pack/add/opt/' . name

+    let dir = split(&packpath, ',')[0] . '/pack/gitadd/opt/' . name

     if !isdirectory(dir)

-      silent execute '!git clone --recurse-submodules' a:url dir

+      silent execute '!git clone --recurse-submodules' join(a:000) a:url dir

       if isdirectory(dir . '/doc')

         execute 'helptags' dir . '/doc'

       endif

     endif

     if empty(a:bang)

-      execute 'packadd!' . name

+      execute 'packadd!' name

     endif