@@ -1,26 +1,62 @@

 "" My |vimrc|

-" A |'textwidth'| of 79 is used throughout.

+" TODO: Supply chain attacks are getting more common. We should use (mandate?)

+" commit hashes in `GitAdd`. Also, make sure to use a command format that

+" ignores tag/branch names (those can be named to look like hashes and are

+" mutable).

+

+" TODO: Do we want to try to integrate with Debian? There seems to be at least

+" two ways vim-related files are installed:

+" - Purely auxilliary files as part of some other package: Files are installed

+"   to `/usr/share/vim/addons` which are referenced by files installed to

+"   `/usr/share/vim/registry`. `vim-addons` from the `vim-addon-manager` can be

+"   used to (presumably) symlink them into a path that is listed in

+"   'runtimepath'.

+" - As a standalone `vim-${addon}` package: Files are installed to

+"   `/usr/share/vim-${addon}`, presumably symlinked into a `start` or `opt`

+"   'packpath' during package installation.

+"   <https://vim-team.pages.debian.net/vim/> and the `dh_vim-addon` man page in

+"   the `dh-vim-addon` package contains some further details.

-""" Comments

+""" Formatting

+

+" A |'textwidth'| of 79 is used throughout.

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

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

+" be highlighted with

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

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

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

 """ Compatibility

+" TODO: Test with `nvi`, a "bug-for-bug compatible" clone of the original BSD

+" `vi`.

+" TODO: Test with `VIM_POSIX=1 "$vim"` (for different `$vim`s?). See

+" |$VIM_POSIX|.

+

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

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

+" - Versions: TODO: Whatever some old {Debian,Ubuntu,Fedora} ships.

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

 " - 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: Unix-like

+" TODO: `man setfont` says:

+" > Note: if a font has more than 256 glyphs, only 8 out of 16 colors can be

+" > used simultaneously. It can make console perception worse (loss of

+" > intensity and even some colors).

+" The default font on my system has 512 glyphs (`showconsolefont -v`).

+

+" TODO: `man setfont` says, in section "CONSOLE MAPS":

+" > Several mappings are involved in the path from user program output to

+" > console display.

+" Might be worth reading up on that. If I already did, document.

+

 """ Features

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

@@ -35,15 +71,17 @@

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

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

+" |no-eval-feature|.

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

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

+" terminals (in particular, the Linux console, via `CHARMAP` in

+" `/etc/default/console-setup`). See

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

 """ Re-sourcing

@@ -73,11 +111,22 @@

 " programming anyway.

 "" Options

+

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

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

+" default local value, `setglobal` does nothing useful. Worse, for options with

+" only a (buffer or window) local value, `setglobal` does nothing, literally.

+" Is that a problem, should we even set local values here? Maybe identifying

+" them and getting rid of them is a good idea?

+

+" TODO: Maybe source |defaults.vim|? Probably not, but add some documentation?

+

+" TODO: Look at |:options| and maybe follow the same grouping?

+

+" NOTE that |OptionSet| was added in

+" <http://ftp.vim.org/pub/vim/patches/8.1/8.1.0081> and may not be available.

 """ Reset

-" set all&

+setglobal all&

 """ Encoding

 " Force Vim's internal encoding to a Unicode encoding.

@@ -95,48 +144,144 @@ set clipboard^=unnamedplus

 set backspace=indent,eol,start

 set virtualedit=block

+""" Modeline

+set nomodeline

+

+""" Navigation

+set nostartofline

+" <http://ftp.vim.org/pub/vim/patches/9.0/9.0.0640>: Cannot scroll by screen

+" line if a line wraps. Add the 'smoothscroll' option.

+if has('patch-9.0.0640')

+  set smoothscroll

+endif

+

 """ Windows

 " Put newly opened windows below and to the right.

 set splitbelow

 set splitright

-""" Interface clutter

-set noruler

+""" Interface

 set showcmd

+set noruler

+set laststatus=1

+set showtabline=1

 set shortmess+=I

-set guioptions=cf

+set guioptions=cf " console dialogs, foreground (no fork())

+set numberwidth=1

 """ 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'| `fold:` is ` ` and `tab:` is: `→ `, `――>`, `├──`,

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

+" TODO: `:help 'fillchars'` says "for `stl` and `stlnc` only single-byte values

+" are supported". Test the current (non-ASCII) values against older versions of

+" Vim. See also <http://ftp.vim.org/pub/vim/patches/8.2/8.2.2569>.

+" TODO: If Vim cannot tell appart |hl-StatusLine| and |hl-StatusLineNC| (e.g.

+" because |hl-StatusLine| is a |hl-link|), (ordinary) spaces and `fillchars`

+" `stl` characters for the statusline of the focused window will be replaced

+" with `^`. Note that this includes the single character under the `fillchars`

+" `vert`, which cannot be set with |'statusline'|.

+set linespace=-1

 set list

 set linebreak

 set breakindent

 set breakindentopt=sbr,shift:2

-set fillchars=stl:_,stlnc:_,vert:│,fold:─,diff:\ |

-set listchars=tab:├\ ┤,trail:•,extends:›,precedes:‹,nbsp:·

-set showbreak=»\ |

+set showbreak=» 

+set fillchars=stl:─,stlnc:─,vert:│,fold:─,diff: 

+" set fillchars=stl:_,stlnc:_,vert:│,fold:─,diff: 

+set listchars=tab:├─,trail:•,extends:›,precedes:‹,nbsp:·

+" <http://ftp.vim.org/pub/vim/patches/8.1/8.1.0759>: Showing two characters for

+" tab is limited. Allow for a third character for "tab:" in 'listchars'.

+if has('patch-8.1.0759')

+  " ab	c

+  " set listchars+=tab:├\ ┤

+  set listchars+=tab:│\ │

+endif

+" TODO: `%f` still shows `[No Name]`, is there a way to remove that?

+set statusline=%(%f\ %)

+if has('eval')

+  " TODO: This works poorly with plugins that have windows with their own

+  " statusbar, e.g. |undotree.txt|.

+  " set statusline=%(%{expand('%:.s?^/??')}\ %)

+  " `fillchar_status` function in `src/screen.c:4649` of Vim source.

+  " TODO: Try to use some other non-standard space? Search for "\<SPACE\>" in

+  " |digraphs|.

+  " set fillchars+=stl:\ ,stlnc: 

+  set fillchars+=stl: ,stlnc: 

+  " set fillchars+=stl:┘,stlnc:┘

+  " TODO: Standardize on global functions? Or |autoload|s (but that would break

+  " our "single file" policy)?

+  " function! s:statusline() abort

+  function! Statusline() abort

+    " TODO: Make this expansion relative to the window-local cwd? Also do other

+    " substitutions, like `$HOME` to `~`, the expanded `$VIMRUMTIME` to the

+    " string `$VIMRUNTIME`, etc. We used to have `s?^/??`, why?

+    " TODO: Harmonize with `titlestring`.

+    let l:title = !empty(&l:buftype) ? &l:buftype : expand('%:~:.')

+    if &l:buftype =~# 'help\|terminal'

+      let l:title .= ':' . expand('%:t')

+    elseif &l:buftype ==# 'quickfix' && exists('w:quickfix_title')

+      let l:title .= ':' . w:quickfix_title

+    endif

+    if !empty(l:title)

+      let l:title .= ' '

+    endif

+    " NOTE: `matchstr` looks for the _first_ match.

+    " TODO: This is slow. Cache the `matchstr` result?

+    let l:fill = matchstr(&fillchars, '\(^\|,\)stl:\zs[^,]*')

+    let l:pad  = winwidth(0) - strwidth(l:title)

+    return l:title . repeat(l:fill, l:pad)

+  endfunction

+  " <http://ftp.vim.org/pub/vim/patches/8.2/8.2.1347>: Cannot easily get the

+  " script ID. Support expand('<SID>').

+  " if has('patch-8.2.1347')

+  "   let &statusline = '%{'.expandcmd('<SID>statusline()').'}'

+  " else

+    let &statusline = '%{Statusline()}'

+  "   function! g:Statusline() abort

+  "     return s:statusline()

+  "   endfunction

+  " endif

+endif

 """ Colors

+" May be overritten later by Vim for terminals with |t_RB|.

 set background=dark

-if has('gui_running')

-  set t_Co=16777216

-endif

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

+set guioptions+=d

+if &t_Co > 16

   set t_Co=16

+  " <https://github.com/neovim/neovim/issues/11974#issuecomment-1658464993>

+  if has('nvim')

+    lua ffi = require "ffi" ffi.cdef "int t_colors" ffi.C.t_colors = 16

+  endif

+endif

+set notermguicolors

+" <https://github.com/termstandard/colors#truecolor-detection>

+if empty($COLORTERM) && !has('vcon')

+  set notermguicolors

 endif

+if has('gui_running')

+  set termguicolors

+endif

+

+""" Bell

+set belloff=error

 """ Title

 set title

-set titlestring=vim:%{fnamemodify(getcwd(),':~:t:s?^$?/?')}%(:%<%{pathshorten(expand('%:~:.'))}%)

+" set titlestring=vi:%{fnamemodify(getcwd(),':~:t:s?^$?/?')}%(:%<%{pathshorten(expand('%:.:s?^/??'))}%)

+" TODO: Break out into `Title()` function and harmonize with `statusline`.

+set titlestring=vi:%{fnamemodify(getcwd(),':~:t:s?^$?/?')}%(:%<%{expand('%:.:s?^/??')}%)

+set titleold=

 """ Tabs

-set expandtab

-set shiftround

+" When reading files written by others, assume default `tabstop=8`.

+" When Writing files, use 4 space indents.

 set shiftwidth=4

+set shiftround

 set softtabstop=-1

+set expandtab

 """ Mouse

 set mouse=a

@@ -144,9 +289,25 @@ set mouse=a

 """ Command-line

 set wildmenu

 set wildmode=longest:full,full

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

+" See also |'suffixes'|.

+set wildignore+=_*

+set wildignore+=.git

+set wildignore+=UPSTREAMS,FORKS

+" Relative to `$HOME`.

+set wildignore+=*/.vim/pack,*/.config/vim/pack,*/.config/nvim/pack

+set wildignore+=*/.cache,

+set wildignore+=*/.mozilla/firefox

+set wildignore+=*/.local/lib,*/.local/share/man

+set wildignore+=*/.vagrant,*/.ansible

+set wildignore+=*/.local/pipx,__pycache__,.venv,*.egg-info

+set wildignore+=*/.cargo

+set wildignore+=*/.npm,node_modules

+set wildignore+=*/.local/share/tldr

+set wildignore+=*/snap

+set wildignore+=*/.wine/dosdevices,*/.wine/drive_*

+" <http://ftp.vim.org/pub/vim/patches/8.2/8.2.4325>: 'wildmenu' only shows few

+" matches. Add the "pum" option: use a popup menu to show the matches.

 if has('patch-8.2.4325')

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

   set wildoptions+=pum

 endif

@@ -163,8 +324,9 @@ set ttimeoutlen=100

 """ Diffs

 set diffopt+=vertical

 set diffopt+=foldcolumn:0

+" <http://ftp.vim.org/pub/vim/patches/8.1/8.1.0360>: Using an external diff

+" program is slow and inflexible. Include the xdiff library. Use it by default.

 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

@@ -173,29 +335,72 @@ endif

 """ Formatting

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

 set textwidth=79

-set winwidth=80

+" set winwidth=80

 " set colorcolumn=+1

 set autoindent

 set nojoinspaces

+" Don't autowrap text, enable comment formatting with |gq|, recognize lists,

+" remove comment leader when joining.

 set formatoptions-=t

-set formatoptions+=q

+" set formatoptions+=q " TODO: This is the default?

 set formatoptions+=n

 set formatoptions+=j

-set nowrap

+set nowrap " See also |breakindent|, |breakindentopt|, |showbreak| set above.

+" A custom 'formatprg' produces nicer results but is harder to replicate for

+" others and places undue burden on documentation contributors. Having simple

+" format rules is more important than slightly prettier formatting.

+" TODO: At least make the expressions valid (we're lacking spaces, no?).

+" if executable('par')

+"   let &formatprg = join(['par', 'T'.&tabstop, 'w'.&textwidth, 'e'])

+"   let &formatprg = join(['par', 'T'.&tabstop, 'w'.&textwidth, 'e', 'j'])

+" elseif executable('fmt')

+"   let &formatprg = 'fmt' . '-w' . &textwidth '-g' . &textwidth

+" endif

 """ Comments

-set commentstring=

+" set commentstring=#%s

 """ Folds

 set foldlevelstart=999

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

 """ Spelling

-set spell

+" set spell

 set spelllang=en_us

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

+" TODO: We can probably do something better/cleaner for the thesaurus on our

+" own. In particular, publicly available, clearly licensed, version controlled,

+" code to generate the vim thesaurus from primary sources.

+" The current `~/.vim/thesaurus/en_us.txt` is downloaded from the URL

+" documented in |'thesaurus'|:

+" <https://github.com/vim/vim/issues/629#issuecomment-443293282>. This zip file

+" contains a patch to <https://www.openoffice.org/lingucomponent/MyThes-1.zip>

+" and the results of running the patched code on the included files, as well as

+" the licenses. `MyThes-1.zip` is linked from

+" <https://www.openoffice.org/lingucomponent/thesaurus.html> and seems to be

+" some version of <https://github.com/hunspell/mythes>. MyThes states in its

+" readme that it is based on WordNet 2.0. However, the latest version as of

+" this writing is 3.1. When generating a Vim version, it helps to have a

+" visualization to guide the heuristics that will probably be needed. Searching

+" <https://wordnet.princeton.edu/related-projects> for "thesaurus" gives

+" several projects. <https://wordvis.com> looks good (try e.g. "completion").

+" Another search hit,

+" <https://www2.seas.gwu.edu/~simhaweb/software/jword/index.html>, states that

+" "WordNet's vocabulary is smaller than other "word" databases", so we might

+" want to use other sources as well, e.g. Roget's Thesaurus.

+"

+" WordNet

+" - <https://wordnet.princeton.edu/download/current-version>

+" - <https://wordnetcode.princeton.edu/wn3.1.dict.tar.gz>

+" Data hosted on Project Gutenberg

+" - <https://www.gutenberg.org/ebooks/3202>  (2002) Moby Thesaurus List

+" - <https://www.gutenberg.org/ebooks/10681> (2004) Roget's Thesaurus of English Words and Phrases

+" - <https://www.gutenberg.org/ebooks/22>    (1991) Roget's Thesaurus

+" - <https://www.gutenberg.org/ebooks/38390> (2011) A Dictionary of English Synonymes [...]

+" - <https://www.gutenberg.org/ebooks/51155> (2016) A Complete Dictionary of Synonyms and Antonyms

+" For Swedish, there is

+" - <https://folkets-lexikon.csc.kth.se/synlex.html>

+" - <https://spraakbanken.gu.se/en/resources/saldo>

 """ Views

 set viewoptions-=options

@@ -205,18 +410,38 @@ set viewoptions+=unix

 """ Files

 set swapfile

 set writebackup

+set backupcopy=yes

 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

+if has('nvim')

+  set shadafile=

+endif

+

+""" Conceal

+set conceallevel=2

+set concealcursor=nc

+

+""" Platform

+set shellslash

+

+""" External tools

+" Not POSIX: `-H` (suggested in 'grepprg'), `-I`.

+set grepprg=grep\ -nHI

+

+""" Quickfix

+set switchbuf=useopen

 "" Mappings

+" TODO: Categorize into map modes. Use the nonspecific |:map| (|mapmode-nvo|)

+" and |:map!| (|mapmode-ic|) more often?

 """ Escape

 " Overwrites the default |i_CTRL-C|, |v_CTRL-C|. See

-" https://vim.fandom.com/wiki/Avoid_the_escape_key.

+" <https://vim.fandom.com/wiki/Avoid_the_escape_key>.

 inoremap <C-C> <Esc>

 xnoremap <C-C> <Esc>

@@ -230,31 +455,77 @@ tnoremap <C-J> <C-W>j

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

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

-""" Buffers

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

+""" Clear and redraw

+" <C-L> is overridden above, so use a <Leader> mapping.

+nnoremap <Space><C-L> <C-L>

+

+""" Movement

+" Up down dispaly lines (unless a count is given).

+nnoremap <expr> j v:count ? 'j' : 'gj'

+nnoremap <expr> k v:count ? 'k' : 'gk'

+

+" End of pair opened at end of current line.

+" TODO: These are overridden by `matchit`.

+nnoremap <silent> g% :<C-U>norm!  $%<CR>

+onoremap <silent> g% :<C-U>norm!  $%<CR>

+xnoremap <silent> g% :<C-U>norm! v$%<CR>

+

+""" Scrolling

+" Put paragraph containing cursor line at the top of the window.

+" TODO: Preserve jump list somehow?

+nnoremap zg {jzt<C-O>

+

+""" Visual mode repeat

+" See also `vim-visualrepeat`.

+xnoremap . :normal! .<CR>

+

+""" Clipboard

+" Yank file and line number of cursor.

+nnoremap <silent> <Space>yy :let @+ = expand('%:p') . ':' . line('.')<CR>

 """ `$MYVIMRC`

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

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

+""" Keyword

+" nnoremap K :silent execute "normal! K" \| redraw!<CR>

+" nnoremap <silent> K :terminal ++close <C-R>=&keywordprg<CR> <cword><CR>

+" TODO: vnoremap

+" TODO: `set keywordprg=:help`

+

 """ Help

+" TODO: Make this filetype dependent? Could use |:grep| or |fugitive|'s

+" |:Ggrep|. On the other hand, there are other built-in mappings that does

+" keyword search in a codebase.

+" TODO: Here we use `g` as prefix. Do we do that in other places? Should we not

+" use <Leader> (i.e. <Space>)?

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

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

 """ Run

+" TODO: Standardize where the output goes.

-" File.

+" File (with output in pager).

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

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

-" Command.

+" Command (with output in new window).

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

+""" Quickfix

+

+"""" Toggle Quickfix window

+" TODO: Do similar for location list?

+" TODO: Make the |botright| global with some |autocmd|?

+nnoremap <expr> <Space><Space>q

+\ empty(filter(range(1,winnr('$')),'getwinvar(v:val,"&buftype")==#"quickfix"'))

+\ ? ':botright copen<CR>'

+\ : ':botright cclose<CR>'

+

 """ Make

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

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

+" TODO: Use the |terminal-debugger| instead of a make target?

 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>

@@ -288,11 +559,17 @@ nnoremap Y y$

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

 xnoremap $ $h

-"""" Visual mode paste doesn't clobber unnamed register

-xnoremap p pgvy

+"""" Visual mode put that doesn't clobber unnamed register

+" See also <http://ftp.vim.org/pub/vim/patches/8.2/8.2.4242>.

+xnoremap P pgvy

+

+""" Visual mode

 """" Visually select last pasted text

 " TODO: Make a text object as well?

+" TODO: I use this relatively often, but it clobbers the built in |gp|. I never

+" use that, but it seems useful, so maybe I should? Find another natural

+" mapping?

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

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

 " support.

@@ -304,13 +581,34 @@ endif

 """" Restrict Visual mode substitutions to the selected text

 xnoremap <Space>s :s/\%V

+"""" Visual movement

+xnoremap <C-h> hoho

+xnoremap <C-j> jojo

+xnoremap <C-k> koko

+xnoremap <C-l> lolo

+

+""" Scrolling

+" Arrow keys scroll. Useful when 'mouse' is empty and the terminal sends arrow

+" keys when scrolling with the mouse.

+noremap <Up>    <C-Y>

+noremap <Down>  <C-E>

+noremap <Left>  zh

+noremap <Right> zl

+

 """ Mouse

 " As suggested in |scroll-mouse-wheel|, scroll only one line.

-noremap <MouseUp>   <C-E>

-noremap <MouseDown> <C-Y>

+noremap <ScrollWheelUp>     <C-Y>

+noremap <ScrollWheelDown>   <C-E>

+noremap <C-ScrollWheelUp>   zh

+noremap <C-ScrollWheelDown> zl

+noremap <ScrollWheelLeft>   zh

+noremap <ScrollWheelRight>  zl

 " Toggle folds.

-noremap <RightMouse> <LeftMouse>za

+noremap <RightMouse>   <LeftMouse>za

+noremap <2-RightMouse> <LeftMouse>za

+noremap <3-RightMouse> <LeftMouse>za

+noremap <4-RightMouse> <LeftMouse>za

 """ Command-line

 " Take already written text into account when searching history.

@@ -333,9 +631,29 @@ endif

 """ Diffs

 " Current file.

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

+" Se also |:DiffOrig|.

+" TODO: Use a buffer?

+" <https://gist.github.com/romainl/7198a63faffdadd741e4ae81ae6dd9e6>

+nnoremap <silent> <Space><Space>dd :w !

+\ diff -u --color=always %:S -

+\ \| tail -n +3

+\ \| less -FR

+\ <CR>

+nnoremap <silent> <Space><Space>dw :w !

+\ diff -u %:S -

+\ \| tail -n +3

+\ \| wdiff -d -n

+\   -w "$([ "$(tput colors)" -ge 16 ] && tput setaf  9 \|\| { tput bold; tput setaf 1; })"

+\   -y "$([ "$(tput colors)" -ge 16 ] && tput setaf 10 \|\| { tput bold; tput setaf 2; })"

+\   -x "$([ "$(tput colors)" -ge 16 ] && tput setaf 15 \|\| { tput bold; tput setaf 7; })"

+\   -z "$([ "$(tput colors)" -ge 16 ] && tput setaf 15 \|\| { tput bold; tput setaf 7; })"

+\ \| less -FR

+\ <CR>

+" Requires `vim-fugitive`.

+nmap <silent> <Space><Space>dg :Gdiffsplit<CR>

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

+" TODO: Is adding a `diffupdate` at the end useful?

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

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

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

@@ -365,6 +683,7 @@ nnoremap zV zMzv

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

 " next/previous fold.

+" TODO: |c_CTRL-R_=| requires |+eval|?

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

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

@@ -399,33 +718,125 @@ if has('eval')

   endfunction

 endif

+""" Normalize date to ISO 8601

+" See |:visual_example|.

+" See also |abolish-coercion|.

+" This is hacky but works without |+eval|.

+xnoremap crd <Esc>`>a<CR><Esc>`<i<CR><Esc>!!date +'\%Y-\%m-\%d' -f -<CR>kJJ

+

+""" Go to string in file under cursor

+

+" The built-in |gF|, and related |CTRL-W_F|, |CTRL-W_gF|, commands extend |gf|

+" by also parsing trailing `:{lineno}` (specifically, any non-filename

+" character optionally surrounded by whitespace, or the literal string

+" ` line `, followed by a decimal number). This corresponds to common output of

+" compilers/interpreters/linters. It also happens to roughly correspond to

+" _one_ of the common (or, for [POSIX.1-2017][], allowed) outputs of `ctags`.

+" It does not however allow the _other_ format: search strings. Let's fix that.

+"

+" Search strings are very useful when you're not sure what version of the file

+" someone else might have, so it's hard to give an accurate line number, but

+" the chance is high that a search string will yield the correct location. It

+" also conveys more information to someone not wanting to _follow_ the

+" reference right now than a line number would.

+"

+" Vim actually allows _any_ Ex command in tag files (subject to |'exrc'| and

+" |'secure'|, see |tag-security|), not just line numbers and search strings,

+" see |tags-file-format|. The mapping below only accepts what amounts to

+" possibly anchored non-regex search strings, for three reasons: 1) security,

+" 2) implementation simplicity, 3) it is what [POSIX.1-2017][] `ctags` / `ex` /

+" `vi` supports.

+"

+" It is important that we lean on the built-in mappings as much as possible

+" since they include functionality based on <count>, |'isfname'|, |'path'|,

+" |'suffixesadd'|, and |'includeexpr'|, special handling of escaped spaces and

+" trailing punctuation, as well as home directory and environment variable

+" expansion (|expandcmd|) that would be hard to re-implement, see |gf|. Note

+" that the built-in mappings only trigger when the cursor is on or before the

+" _filename_, not on the address. |gF| falls back to |gf| functionality without

+" giving an error message if a traling line number can't be found, which we

+" mimic.

+"

+" [POSIX.1-2017]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/ctags.html#tag_20_27_12

+

+" TODO: Also support `file:line:col`?

+

+if has('eval')

+  nnoremap gF      :<C-U>call <SID>gf("gF")<CR>

+  nnoremap <C-W>F  :<C-U>call <SID>gf("\<lt>C-W>F")<CR>

+  nnoremap <C-W>gF :<C-U>call <SID>gf("\<lt>C-W>gF")<CR>

+  function! s:gf(cmd) abort

+    let back   = '\\\\'

+    let fwd    = '\\\/'

+    let dollar = '\$\/\@!'

+    let other  = '[^\/$]'

+    let chr    = '\%(' . join([back, fwd, dollar, other], '\|') . '\)'

+    let str    = '\(' . chr . '\+\)'

+    let start  = '\(\^\?\)'

+    let end    = '\(\$\?\)'

+    let addr   = '\/' . start . str . end . '\/'

+    let after  = '\%>' . (col('.')-1) . 'c'

+    let file   = '[[:fname:]]'

+    let sep    = '[[:space:]]*[^[:fname:][:digit:]/][[:space:]]*'

+    let pat    = '\m' . after . file . sep . addr

+    let match  = matchlist(getline('.'), pat)

+    execute 'normal!' (v:count1 . a:cmd)

+    if !empty(match)

+      let start = match[1]

+      let str   = match[2]

+      let end   = match[3]

+      let pat   = '\C' . '\m' . start . '\V' . str . '\m' . end

+      call cursor(1, 1)

+      if search(pat, 'c') == 0

+        echo "Could not find search string:" (start . str . end)

+      endif

+    endif

+  endfunction

+endif

+

+"" Commands

+

+""" Fill quickfix with output from system command

+" TODO: |<q-args>| does not seem to escape quotes, so things like `Cexpr echo

+" 'hello'` does not work. Probably passing it to a function so that we get a

+" argument variable to call |shellescape| on is required?

+" TODO: How does this compare to |dispatch|?

+command! -bang -complete=shellcmd -nargs=+ Cexpr

+\ execute (empty(<q-bang>)?'cexpr':'cgetexpr') 'system(expandcmd(' escape(<q-args>, "'") '))'

+

+""" Run `git ls` and preview commits on cursor move

+" Requires `vim-fugitive` and a `ls`/`lsa` Git alias.

+command! -bar Gls

+\ Git ls |

+\ execute 'nmap <silent> <buffer> j j:silent vert Gpedit <cword><CR><C-W>=' |

+\ execute 'nmap <silent> <buffer> k k:silent vert Gpedit <cword><CR><C-W>=' |

+\ execute 'autocmd vimrc BufUnload <buffer> pclose' |

+command! -bar Glsa

+\ Git lsa |

+\ execute 'nmap <silent> <buffer> j j:silent vert Gpedit <cword><CR><C-W>=' |

+\ execute 'nmap <silent> <buffer> k k:silent vert Gpedit <cword><CR><C-W>=' |

+\ execute 'autocmd vimrc BufUnload <buffer> pclose' |

+

 "" Auto commands

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

 augroup vimrc

   autocmd!

 augroup END

-""" 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 vimrc QuickFixCmdPost  *{make,{,vim}grep}* nested botright cwindow

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

+""" Hacks for options that Vim likes to reset

-""" Highlight all searches

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

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

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

+" `$VIMRUNTIME/colors/default.vim`

+autocmd vimrc OptionSet background set background=dark

 """ Save/load view

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

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

-autocmd vimrc BufWinEnter *

+" Roughly as suggested in |:loadview|, load auto-saved view when opening

+" buffer. Better than |last-position-jump|, |restore-cursor|. See also

+" |'viewoptions'|.

+autocmd vimrc BufWinEnter,BufRead *

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

 \   loadview |

 \ endif |

-autocmd vimrc BufWinLeave *

+autocmd vimrc BufWinLeave,BufWrite *

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

 \   mkview |

 \ endif |

@@ -433,75 +844,223 @@ autocmd vimrc BufWinLeave *

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

+if !has('nvim')

+  autocmd vimrc BufReadPost,TerminalWinOpen *

+  \ if !empty(&buftype) |

+  \   silent setlocal nolist nospell |

+  \ endif

+endif

+

+""" QuickFix/Location list

+

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

+" TODO: Maybe this can be fixed by switching back to the previous window after

+" opening the quickfix window? Make sure to only switch to the previous if we

+" actually opened the window.

+" autocmd vimrc QuickFixCmdPost [^l]* nested botright cwindow

+" autocmd vimrc QuickFixCmdPost   l*  nested botright lwindow

+" autocmd vimrc QuickFixCmdPost  {{make,{,vim}grep{,add}},c{,get,add}{expr,file,buffer}} nested botright cwindow

+" autocmd vimrc QuickFixCmdPost {l{make,{,vim}grep{,add}},l{,get,add}{expr,file,buffer}} nested botright lwindow

+

+"""" Conceal column numbers

+autocmd vimrc BufReadPost quickfix

+\ setlocal conceallevel=2 concealcursor=nvic nonumber |

+\ syntax match qfColumnNr / col \d\+/ containedin=qfLineNr transparent conceal |

+

+""" Highlight all searches

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

+if has('eval')

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

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

+endif

 "" Colors

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

-""" Overrides

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

+silent !. ~/.shrc.d/color.sh

+" redraw!

+

+" TODO: Document that |autocmd| is available in "tiny" (i.e. always) but

+" |+syntax| requires "normal", so doing it the way we're doing it makes sure it

+" works everywhere. This is especially important for interface highlights

+" (|listchars|).

+

+" TODO: This is getting ridiculous. |:syntax-on| suggests we can just use

+" |:highlight| outside any |autocmd|s and it will work. Look into this.

+

+" TODO: Support `has('gui_running')` and |'termguicolors'|. Look into e.g.

+" |g:terminal_ansi_colors|.

+

+""" General

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

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

 " |:hi-normal-cterm|.

 if !has('gui_running')

-  autocmd vimrc VimEnter,ColorScheme *

+  autocmd vimrc ColorScheme * nested

   \ highlight! Normal guibg=NONE |

 endif

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

-autocmd vimrc VimEnter,ColorScheme *

-\ 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! link SpecialKey Special |

-\ highlight! link NonText    Special |

-

-""" Folds

-autocmd vimrc VimEnter,ColorScheme *

-\ highlight! link Folded Comment |

+" TODO: Look at all in |'highlight'| (in particular |hl-Search|) and |highlight-default|.

+" TODO: This could be done by setting |'highlight'| instead of monkying around

+" with highlight groups. Unclear if better.

+" TODO: For all chromatic colors, use `Light*`.

+" TODO: Remove all `White` except `Normal` from this list and link them to `Normal`?

+" TODO: Remove all `Gray` except `Comment` from this list and link them to `Comment`?

+" NOTE: When |hl-StatusLine| is a |:hi-link| Vim cannot determine if it's equal

+" to |hl-StatusLineNC| and uses "^^^". Same for `StatusLineTerm{,NC}`. See

+" `src/drawscreen.c:550` (at the bottom of the funtion `win_redr_status`) in

+" the Vim source.

+" TODO: Since the Linux console cannot use `DarkGray` as a background, consider

+" using any other `Dark*` color (e.g. `DarkYellow`) as (non-`reverse`) `Visual`

+" `ctermbg` with `ctermfg=NONE`. NOTE: This requires that we standardize on

+" `__color_set_uniform_diff_low`. `__color_set_uniform_diff_high` works (in

+" fact is required) for `cterm=reverse ctermfg=NONE ctermbg=NONE`.

+" TODO: Why do we need the `term=NONE`? Is this tested ever? Is it used in

+" `vim.tiny`?

+

+" TODO: Vim requests the background color from the terinal with the escape

+" sequence |t_RB| and sets |'background'| when it gets the response

+" (|v:termrbgresp|). That response may come after |vimrc| has completed, so if

+" you want to do |:colorscheme| do it in a `autocmd vimrc OptionSet

+" background`.

+