@@ -3,7 +3,8 @@

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

+" mutable). Maybe we deem some "publishers" worthy of trust, Tim Pope tags

+" releases of many of his plugins for instance.

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

 " two ways vim-related files are installed:

@@ -18,6 +19,24 @@

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

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

+" TODO: |unix| says

+"

+" > Temporary files (for filtering) are put in "/tmp".  If you want to place

+" > them somewhere else, set the environment variable $TMPDIR to the directory

+" > you prefer.

+"

+" and since we go to some effort to keep other intermediate files in

+" `~/.cache/vim` for privacy, we might want to create a shell alias that does

+" `alias vim='TMPDIR="$HOME/.cache/vim/tmp" vim'`, as well as making sure that

+" directory exists in shell startup files.

+"

+" Actually, I'm pretty sure we can do this from inside Vim (requires 'eval'

+" though), which might be cleaner (although some dotfiles for other programs

+" that do similar things do it in shell startup files). Do both?

+"

+" NOTE: This is an environment variable and affects child processes, including

+" ones run from the `:terminal`.

+

 """ Formatting

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

@@ -38,6 +57,7 @@

 " |$VIM_POSIX|.

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

+"

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

@@ -47,26 +67,34 @@

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

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

+"

 " - |+multi_byte|

 " - |+mouse|

 " - |+tag_binary|

 " - |+user_commands|

 " - |+autocmd|

 " - |+localmap|

+"

+" TODO: What category features are placed in depends on Vim version. Look up

+" and create some table.

 " 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

@@ -74,6 +102,21 @@

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

 " |no-eval-feature|.

+""" Patches

+

+" TODO: Instead of checking for patches we might want to standardize on

+" `exists()` instead since it is more descriptive and takes the compile-time

+" |+feature-list| into account (which would otherwise require

+" `has('patch-{patch}') && has('{feature}')`). The version/patch does indicate

+" how old the feature is and so how likely to be supported. Use

+" `exists('+option')` (not `exists('&option')`, see e.g. |missing-options|) and

+" `exists('##event')`

+

+" See |has-patch|.

+" |:helpgrep| |c_CTRL-R_CTRL-A| (mapped to `<Space>K` below).

+

+" - 8.1.0081

+

 """ Encoding

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

@@ -84,6 +127,18 @@

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

 " - `man showconsolefont`

+" One can find characters by looking at |digraph-table| in a lowest common

+" denominator terminal. Some characters tested to work (not all from Code Page

+" 437) *myvimrc-characters*:

+" - Rectangular: ■█▒░ (not ▌▐▓)

+" - Triangular: (not ►◄▲▼)

+" - Circular: ●•∙· (not ○☼)

+" - Other: ‼︎… (not ⌂♦☺︎☻)

+" - Arrows: ‹›«»←→↑↓ (not ↔↕)

+" - Box: │─├┤┼ (not ║═)

+" - Math: ∩×∆∅

+" - Greek: ΔΛλ

+

 """ Re-sourcing

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

@@ -105,13 +160,73 @@

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

+" In this file, |<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. |mapleader| is still set though,

+" because some plugins expect it.

+

+""" Debugging

+

+" See |load-plugins|, |slow-start|.

+

+""" Novice

+" |myvimrc-novice|

+

+" The goal is to make it at least workable to pair program with a Vim novice

+" using this configuration.

+" From more heavy-handed to less:

+" - `$VIMRUNTIME/evim.vim`, |easy|, |evim-keys|, |i_CTRL-L|

+" - `$VIMRUNTIME/mswin.vim`

+" - |:behave|

+

+" TODO: Mark novice-unfriendly option settings as

+" |myvimrc-novice-unfriendly-$option|? (My original motivator for this was that

+" I thought setting 'hidden' was a bit dangerous, but it is set automatically

+" in easy mode!)

+

+"" Helpers

+

+""" Define and clear autocmd group

+" TODO: I seem to remember augroups being closed automatically at end of file,

+" in which case we could omit the `augroup END` and group name from our

+" `autocmd`s.

+augroup vimrc

+  autocmd!

+augroup END

+

+""" Functions

+if has('eval')

+

+  " See |has-patch|.

+  " TODO: After and including 7.4.237 `has("patch-{major}.{minor}.{patch}")`

+  " works and is nicer. If we never check for any version before that we might

+  " remove this.

+  function! s:has(major, minor, patch) abort

+    let version = 100 * major + minor

+    return v:version > version || (v:version == version && has('patch'.patch))

+  endfunction

+

+  " `$VIMSRC/src/option.h:/P_COMMA/`

+

+  " `$VIMSRC/src/option.h:/P_FLAGLIST/`

+

+endif

 "" Options

+" |:let-option|

+

+" Note that even options listed as local (only) have global variants. E.g.

+" 'fileencoding' is listed as "local to buffer" but 'fileencodings' says: "Note

+" that 'fileencodings' is not used for a new file, the global value of

+" 'fileencoding' is used instead.  You can set it with: `:setglobal

+" fenc=iso-8859-2`".

+

+" `$VIMSRC/src/optiondefs.h:/Options local to a window/`

+" `$VIMSRC/src/structs.h:/Options local to a window/`

+" `$VIMSRC/src/structs.h:/options that are local to a window/`

+

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

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

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

@@ -122,10 +237,11 @@

 " 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

+" Undoes changes to global options made by any |system-vimrc| or interactively

+" (if re-sourced). The value of 'compatible' determines what defaults are

+" loaded, but 'nocompatible' is set automatically at startup when a user vimrc

+" file (this file!) is found |compatible-default|.

 setglobal all&

 """ Encoding

@@ -145,34 +261,51 @@ set backspace=indent,eol,start

 set virtualedit=block

 """ Modeline

-set nomodeline

+" 'modeline' is local to buffer, 'modelines' is global.

+" set nomodeline

+set modelines=0

 """ Navigation

 set nostartofline

+set sidescroll=1

+set sidescrolloff=1

+" set scrolloff=1 " Useful for |[[|.

+set display=lastline

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

+  set smoothscroll " TODO: Local to window.

 endif

 """ Windows

 " Put newly opened windows below and to the right.

+" Use |:aboveleft| to override.

 set splitbelow

 set splitright

 """ Interface

 set showcmd

+" TODO: Also look a bit at <https://github.com/tpope/vim-flagship>? Maybe

+" `flagship#tabcwds()` to summarize the tab working directory.

+" TODO: We could split the current `Statusline()` into

+" `Statusline{Left,Right}()` and have the new `Statusline()` join them with

+" 'fillchars', and `Ruler()` join them with `:`. Since the same functionality

+" is also used by 'titlestring' maybe name them something less statusline

+" centric? `Bufname(fill, right)`?

+" set ruler

+" set rulerformat=%=%(%{expand('%:t')}:%)%l

 set noruler

 set laststatus=1

 set showtabline=1

-set shortmess+=I

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

-set numberwidth=1

+set shortmess+=I " See |:intro|.

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

+set numberwidth=1 " TODO: Local to window.

 """ Interface characters

+" See also |myvimrc-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: `→ `, `――>`, `├──`,

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

@@ -180,69 +313,130 @@ set numberwidth=1

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

+" with `^` (i.e. the default `fillchars` `stl`). 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 showbreak=» 

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

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

+set list " TODO: Local to window.

+set linebreak " TODO: Local to window.

+set breakindent " TODO: Local to window.

+set breakindentopt=sbr,shift:2 " TODO: Local to window.

+set showbreak=»  " TODO: Local to window (or global).

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

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

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

+  " set listchars+=tab:├─┤

+  " set listchars+=tab:├ ┤

+  set listchars+=tab:│ │

 endif

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

-set statusline=%(%f\ %)

+set statusline=%(%f %) " TODO: Local to window (or global).

 if has('eval')

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

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

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

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

   " 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! s:opt(opt, key) abort

+      return matchstr(a:opt, '.*\(^\|,\)' . key . ':\zs[^,]*')

+      return split(a:opt, )

+  endfunction

+  function! s:expand() abort

+  endfunction

   function! Statusline() abort

+    " TODO: The global CWD, `getcwd(-1)`, might be useful. Also indicate

+    " `haslocaldir()` somehow?

     " 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

+    " TODO: Generalize `&filetype`, `&buftype` and the matched `bufname()`

+    " `<type>://` somehow?

+    if &filetype ==# 'man'

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

+    " elseif &buftype =~# 'nofile\|nowrite'

+    "   let title = &filetype

+    elseif &buftype ==# 'help'

+      let title = &buftype . ':' . expand('%:t:s?.txt$??')

+    elseif &buftype ==# 'terminal'

+      " TODO: We sometimes want to use some variation of `expand('%')`, e.g.

+      " when using the |terminal-debugger|.

+      " TODO: 'statusline' is not re-evaluated when |term_gettitle()| changes,

+      " can we do something like `let &statusline = &statusline` in some

+      " |autocmd| (perhaps one that triggers when the terminal content

+      " changes)? Worst case |CursorMoved|.

+      let title = &buftype . ':' . substitute(term_gettitle(bufnr()), '[^:]*:', '', '')

+    " TODO: Change the `&&` into nested `if`? Note that it has different

+    " semantics because of the `if`/`elseif`/`else` chain.

+    elseif &buftype ==# 'quickfix' && !empty(get(w:, 'quickfix_title'))

+      " Remove leading colon (Ex commands) and trailing parenthesis (e.g.

+      " |dispatch| job number).

+      let title = w:quickfix_title

+      let title = substitute(title, '^:', '', '')

+      let title = substitute(title, '\s*([^)]\+)\s*$', '', '')

+      let title = &buftype . ':' . title

+    else

+      let title = expand('%')

+      " fugitive:///home/rcrnstn/repo/.git//hash/dir/file.ext

+      " fugitive:///home/rcrnstn/repo/.git//hash/dir/file.ext

+      " TODO: |split()| on `:` (info), `://` (fugitive) and `#` (info), do

+      " processing, and then `join(filter(parts, '!empty(v:val)'), ':')`.

+      " Replace names of the form `<type>://<path>/.<dot>//<obj>` with

+      " `<type>:<obj>` where any leading 40 character hex string (hash) in

+      " `<obj>` is truncated to 7 characters. (Yes, this was designed for

+      " |fugitive|.)

+      let parts = matchlist(expand('%'),

+      \ '^\%(\([^:]\+\)://\)\?\%(\(.*\)//\)\?\(.*\)'

+      \ )

+      if !empty(parts)

+        let [type, prefix, path] = parts[1:3]

+        if !empty(prefix)

+          while fnamemodify(prefix, ':t')[:0] ==# '.'

+            let prefix = fnamemodify(prefix, ':h')

+          endwhile

+          let prefix = fnamemodify(prefix . '/', ':~:.:h:t:s?^\.$??')

+        endif

+        let path = substitute(path,

+        \   '^\([0-9a-fA-F]\{7\}\)[0-9a-fA-F]\{33\}\(/.*\|$\)', '\1\2', ''

+        \ )

+        let title = join(filter([type, prefix, path], '!empty(v:val)'), ':')

+      endif

     endif

-    if !empty(l:title)

-      let l:title .= ' '

+    if !empty(title)

+      let title = substitute(title, ' *$', '', '') . ' '

     endif

+    let title = substitute(title, ' ',  ' ', 'g')

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

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

+    let pad  = winwidth(0) - strdisplaywidth(title)

+    return title . repeat(fillchar, 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()}'

+    set statusline=%{Statusline()} " TODO: Local to window (or global).

   "   function! g:Statusline() abort

   "     return s:statusline()

   "   endfunction

   " endif

+  " TODO: This doesn't seem to do the trick.

+  autocmd vimrc CursorMoved *

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

+  \   let &statusline = &statusline |

+  \ endif |

 endif

 """ Colors

@@ -270,41 +464,71 @@ set belloff=error

 """ Title

 set title

+set titlelen=0

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

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

+" TODO: Ideas from `tpope/vim-flagship`: `hostname()` and `v:servername`.

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

 set titleold=

+function! s:cwdname() abort

+  return fnamemodify(getcwd(), ':~:t:s?^$?/?')

+endfunction

+

+function! s:bufname() abort

+  return expand('%:.:s?^/??')

+  return pathshorten(expand('%:.:s?^/??'))

+endfunction

+

 """ Tabs

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

 " When Writing files, use 4 space indents.

-set shiftwidth=4

+set shiftwidth=4 " TODO: Local to buffer.

 set shiftround

-set softtabstop=-1

-set expandtab

+set softtabstop=-1 " TODO: Local to buffer.

+set expandtab " TODO: Local to buffer.

 """ Mouse

+" |scroll-mouse-wheel| is generally useful, the rest for |myvimrc-novice|.

 set mouse=a

+set mousemodel=popup

+set selectmode+=mouse

+

+""" Novice

+set keymodel=startsel,stopsel

+set selectmode+=key

+set whichwrap+=<,>,[,]

 """ Command-line

+" See also Readline's `menu-complete`, documented in `bash(1)`.

 set wildmenu

 set wildmode=longest:full,full

 " See also |'suffixes'|.

-set wildignore+=_*

+" Source control.

+" set wildignore+=_*

 set wildignore+=.git

-set wildignore+=UPSTREAMS,FORKS

+" Programming language specific.

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

+set wildignore+=node_modules

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

+set wildignore+=$HOME/projects/UPSTREAMS

+set wildignore+=$HOME/.vim/pack

+set wildignore+=$HOME/.config/vim/pack

+set wildignore+=$HOME/.config/nvim/pack

+set wildignore+=$HOME/.cache

+set wildignore+=$HOME/.local/lib

+set wildignore+=$HOME/.local/share/man

+set wildignore+=$HOME/.local/share/tldr

+set wildignore+=$HOME/.mozilla/firefox

+set wildignore+=$HOME/.ansible

+set wildignore+=$HOME/.vagrant

+set wildignore+=$HOME/.local/pipx

+set wildignore+=$HOME/.cargo/register

+set wildignore+=$HOME/.cargo

+set wildignore+=$HOME/.npm

+set wildignore+=$HOME/.wine/dosdevices

+set wildignore+=$HOME/.wine/drive_*

+set wildignore+=$HOME/snap

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

@@ -316,10 +540,19 @@ set incsearch

 set shortmess-=S

 """ Timing

-set lazyredraw

 set notimeout

+

+""" Terminal

 set ttimeout

 set ttimeoutlen=100

+set ttyfast

+set lazyredraw

+" A |'ttyscroll'| of 0 is beneficial on local terminals (especially reduces

+" flickering on Linux VT), but might be worse on slow remote connections. Set

+" |'writedelay'| to a small value (like 1), and maybe |'redrawtime'| to a very

+" large value (like 20000), to see what difference this option makes. See also

+" |myvimrc-autocmd-ttyscroll|.

+set ttyscroll=0

 """ Diffs

 set diffopt+=vertical

@@ -327,47 +560,49 @@ 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')

-  set diffopt+=internal

+  " set diffopt+=internal

   set diffopt+=algorithm:histogram

   set diffopt+=indent-heuristic

 endif

 """ Formatting

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

-set textwidth=79

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

+set textwidth=79 " TODO: Local to buffer.

 " set winwidth=80

-" set colorcolumn=+1

-set autoindent

+" set colorcolumn=+1 " TODO: Local to window.

+set autoindent " TODO: Local to buffer.

 set nojoinspaces

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

-" remove comment leader when joining.

-set formatoptions-=t

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

+" Don't autowrap text (non-comments), recognize lists, remove comment leader

+" when joining.

+set formatoptions-=t " TODO: Local to buffer.

 set formatoptions+=n

 set formatoptions+=j

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

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

+set nowrap " TODO: Local to window.

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

+" TODO: Local to buffer (or global).

 " 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

+"   let &formatprg = join(['fmt', '-w'.&textwidth, '-g'.&textwidth])

 " endif

 """ Comments

-" set commentstring=#%s

+" set commentstring=#%s " TODO: Local to buffer.

 """ Folds

 set foldlevelstart=999

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

+" TODO: Local to window.

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

 """ Spelling

 " set spell

-set spelllang=en_us

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

+set spelllang=en_us " TODO: Local to buffer.

+set thesaurus=~/.vim/thesaurus/en_us.txt " TODO: Local to buffer (or global).

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

@@ -401,36 +636,65 @@ set thesaurus=~/.vim/thesaurus/en_us.txt

 " For Swedish, there is

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

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

+"

+" Other assorted resources:

+" - <https://github.com/dahu/vimdictive>

+" - <https://dict.org>

 """ Views

+" TODO: Per the documentation `curdir` is only supposed to save the

+" window-local directory as set by |:lcd|, which I wouldn't mind so much and

+" might even make use of. But currently it is being set apparently without my

+" involvement (perhaps by some plugin, probably |netrw|) far too often, and

+" since we do |:loadview| on every opened file this gets annoying fast.

 set viewoptions-=options

+set viewoptions-=curdir

 set viewoptions+=slash

 set viewoptions+=unix

 """ Files

-set swapfile

+set swapfile " TODO: Local to buffer.

 set writebackup

-set backupcopy=yes

-set undofile

+set backupcopy=yes " TODO: Local to buffer (or global).

+set undofile " TODO: Local to buffer.

 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('eval')

+  let $TMPDIR = $HOME . '/.cache/vim/tmp'

+  call mkdir($TMPDIR, 'p')

+endif

 if has('nvim')

   set shadafile=

 endif

 """ Conceal

-set conceallevel=2

-set concealcursor=nc

+set conceallevel=2 " TODO: Local to window.

+set concealcursor=n " TODO: Local to window.

 """ Platform

 set shellslash

+""" Filenames

+" I generally allow everything (except control codes) in filenames on the

+" filesystem. However, only media files (photos or videos) tend to take

+" advantage of that, to be more descriptive/preserve some upstream name. Files

+" I will want Vim to be able to cross-reference will be text (code or notes)

+" with more constrained names. Disallowing some punctuation makes things like

+" |gf| more useful.

+" NOTE: This is a global option, but some ftplugins (Perl) change it anyway.

+" `:grep -R 'isf\(name\)\?' /usr/share/vim/vim82/ftplugin/`

+" *myvimrc-isfname-bug*

+set isfname-=, " Common file separator.

+set isfname-=; " Common file separator.

+set isfname-=: " Common file separator (e.g. when using |gf|).

+set isfname-=# " URL fragment separator.

+

 """ External tools

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

-set grepprg=grep\ -nHI

+set grepprg=grep\ -nHI " TODO: Local to buffer (or global).

 """ Quickfix

 set switchbuf=useopen

@@ -439,13 +703,23 @@ set switchbuf=useopen

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

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

+""" Mapleader

+" Prefill command line with query to discover mapleader mappings.

+nnoremap <Space>?        :verbose nmap <lt>Space>

+nnoremap <Space><Space>? :verbose nmap <lt>Space><lt>Space>

+

 """ Escape

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

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

 inoremap <C-C> <Esc>

 xnoremap <C-C> <Esc>

+""" Novice

+" We 

+

 """ Windows

+

+"""" Focus

 nnoremap <C-H> <C-W>h

 nnoremap <C-J> <C-W>j

 nnoremap <C-K> <C-W>k

@@ -455,28 +729,84 @@ tnoremap <C-J> <C-W>j

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

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

+"""" Move

+if has('eval')

+  function! s:winmove(dir) abort

+    let prefix =

+    \ dir ~=# '[hj]' ? 'leftabove' :

+    \ dir ~=# '[kl]' ? 'belowright'

+    winnr(a:dir)

+  endfunction

+endif

+

+"""" Empty vertical split

+" See also |CTRL-W_n|, which does |:new|.

+nnoremap <C-W>N :vnew<CR>

+

+"""" Resize

+" Resize height to number of lines in buffer.

+nnoremap <expr> <C-W>? line('$')."<C-W>_"

+

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

+" TODO: Mappings like these that extend builtin functionality (identify them

+" and put them in the same place) could be made more formally feature complete

+" by doing the same thing for any aliases (listed in `:help j` etc). If the

+" functinonality is implemented in other modes (insert and the various visual

+" modes) then that should probably be extended too. Document this general

+" principle.

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

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

+" When moving to the next/previous '{'/'}' in the first column (function

+" body/struct definition start/end), make visible the matching '}'/'{'

+" (function body/struct definition end/start) and paragraph containing '{'

+" (function prototype/struct name and preceeding comments). A prefix of 'g'

+" aligns the paragraph containing '{' to the top of the window.

+" TODO: Keep jumps somehow? `:keepjumps normal!`?

+" TODO: |]]| says "[count] sections forward or to the next '{' in the first

+" column". |section| says "a section begins after a form-feed (<C-L>) in the

+" first column and [...]". We completely ignore the form-feed aspect. It's not

+" commonly seen in code, but the GNU Coding Standards recommends them

+" <https://www.gnu.org/prep/standards/standards.html#index-formfeed>.

+nnoremap  ]] ]]%%m'vipo<Esc>''

+nnoremap g]] ]]%%m'vipozt<Esc>''

+nnoremap  [[ [[%%m'vipo<Esc>''

+nnoremap g[[ [[%%m'vipozt<Esc>''

+nnoremap  ][ ][m'%vipo<Esc>''

+nnoremap g][ ][m'%vipozt<Esc>''

+nnoremap  [] []m'%vipo<Esc>''

+nnoremap g[] []m'%vipozt<Esc>''

+

+""" Search and edit file

+" See also |ctrlp|.

+nnoremap <C-P> :edit **/**<Left>

+

+""" Visual line insert and append

+" TODO: This breaks text object that start with `A` or `I`. Ironically, those

+" two characters specifically are prefixes in `wellle/targets.vim`.

+" xnoremap <expr> A mode() !=# 'V' ? 'A' : ':normal A'

+" xnoremap <expr> I mode() !=# 'V' ? 'I' : ':normal I'

+

 " End of pair opened at end of current line.

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

+" TODO: These are overridden by `matchit`, use `<Space>%` instead?

 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.

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

 " TODO: Preserve jump list somehow?

-nnoremap zg {jzt<C-O>

+" TODO: If |+eval|, also account for |scrolloff|?

+nnoremap z{ {jzt<C-O>

+nnoremap z} }kzb<C-O>

 """ Visual mode repeat

-" See also `vim-visualrepeat`.

+" See also `visualrepeat`.

 xnoremap . :normal! .<CR>

 """ Clipboard

@@ -484,7 +814,7 @@ xnoremap . :normal! .<CR>

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

 """ `$MYVIMRC`

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

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

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

 """ Keyword

@@ -499,6 +829,7 @@ nnoremap <silent> <Space><Space>vs :source $MYVIMRC<CR>

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

+" TODO: We do have a `<Space>K` `FileType vim,help` mapping.

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

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

@@ -514,13 +845,25 @@ nnoremap <Space><Space>! :new \| .!

 """ Quickfix

+"""" Go to first/last valid entry

+" |:cfirst|, |:clast|, |[Q|, and |]Q| (the last ones being

+" `vim-unimpaired` mappings) go to the first/last entry regardless of whether

+" it is |quickfix-valid| (includes a file name). I prefer to go to the

+" first/last entry that includes a file name (even if I was already

+" before/after that entry).

+nnoremap [Q :cfirst \| silent! execute "cnext\|cprev"<CR>

+nnoremap ]Q :clast  \| silent! execute "cprev\|cnext"<CR>

+

 """" Toggle Quickfix window

 " TODO: Do similar for location list?

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

+" TODO: Make the |botright| global with some |autocmd|? Is it implied by our

+" `set split{below,right}`?

 nnoremap <expr> <Space><Space>q

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

-\ ? ':botright copen<CR>'

-\ : ':botright cclose<CR>'

+\ empty(filter(getwininfo(),

+\   'getbufvar(v:val.bufnr, "&buftype") ==# "quickfix"'

+\ ))

+\   ? ':botright copen<CR>'

+\   : ':botright cclose<CR>'

 """ Make

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

@@ -557,6 +900,10 @@ nnoremap <silent> ZQ :quit<CR>

 nnoremap Y y$

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

+" TODO: Do you just want `set selection=old`? Nope, the builtin `matchit`

+" doesn't work correctly with `selection=old`, this is probably a bug though

+" and might get fixed.

+" set selection=old

 xnoremap $ $h

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

@@ -582,38 +929,70 @@ endif

 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

+xnoremap <C-H> hoho

+xnoremap <C-J> jojo

+xnoremap <C-K> koko

+xnoremap <C-L> lolo

 """ Mouse

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

-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

+

+"""" Scroll vertically by single lines

+" As suggested in |scroll-mouse-wheel|.

+nnoremap <ScrollWheelUp>        <C-Y>

+xnoremap <ScrollWheelUp>        <C-Y>

+inoremap <ScrollWheelUp>   <C-O><C-Y>

+nnoremap <ScrollWheelDown>      <C-E>

+xnoremap <ScrollWheelDown>      <C-E>

+inoremap <ScrollWheelDown> <C-O><C-E>

+

+"""" Scroll horizontally by single columns with <C-Scrollwheel>

+nnoremap <C-ScrollWheelUp>        zh

+xnoremap <C-ScrollWheelUp>        zh

+inoremap <C-ScrollWheelUp>   <C-O>zh

+nnoremap <C-ScrollWheelDown>      zl