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

   endfunction

-  "" File type

+  """ File type

-  """ Built-in `vim`

+  """" Built-in `vim`

   " See |ft-vim-indent|.

   let g:vim_indent_cont = 0

-  """ Built-in `sh`

+  """" Built-in `sh`

   " See |ft-sh-syntax|.

   let g:is_posix = 1

-  """ Built-in `man`

+  """" Built-in `man`

   " See |ft-man-plugin|.

   let g:ft_man_folding_enable = 1

   runtime ftplugin/man.vim

-  set keywordprg=:Man

+  setglobal keywordprg=:Man

-  """ `sheerun/vim-polyglot`

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

+  """" `sheerun/vim-polyglot`

+  GitAdd https://github.com/sheerun/vim-polyglot

   let g:vim_markdown_no_default_key_mappings = 1

@@ -533,20 +548,20 @@ if has('eval')

   \   'autoindent',

   \ ]

-  """ `tpope/vim-sleuth`

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

+  """" `tpope/vim-sleuth`

+  GitAdd https://github.com/tpope/vim-sleuth

-  """ `tpope/vim-apathy`

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

+  """" `tpope/vim-apathy`

+  GitAdd https://github.com/tpope/vim-apathy

-  """ `tpope/vim-scriptease`

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

+  """" `tpope/vim-scriptease`

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

-  """ `jyscao/vim-greprtpscr`

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

+  """" `jyscao/vim-greprtpscr`

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

-  """ `vimwiki/vimwiki`

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

+  """" `vimwiki/vimwiki`

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

   " let g:vimwiki_list = [{

   " \   'path':   '~/notes/',

@@ -554,23 +569,23 @@ if has('eval')

   " \   'ext':    '.md',

   " \ }]

-  "" Normal mode

+  """ Normal mode

-  """ Built-in `matchit`

+  """" Built-in `matchit`

   packadd! matchit

-  """ `tpope/vim-unimpaired`

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

+  """" `tpope/vim-unimpaired`

+  GitAdd https://github.com/tpope/vim-unimpaired

-  """ `tpope/vim-repeat`

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

+  """" `tpope/vim-repeat`

+  GitAdd https://github.com/tpope/vim-repeat

-  """ `tpope/vim-characterize`

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

+  """" `tpope/vim-characterize`

+  GitAdd https://github.com/tpope/vim-characterize

-  """ `haya14busa/vim-asterisk`

-  PackAdd https://github.com/haya14busa/vim-asterisk

+  """" `haya14busa/vim-asterisk`

+  GitAdd https://github.com/haya14busa/vim-asterisk

   " As suggested by |asterisk-key-mappings|, except the mappings that don't

   " move the cursor set |'hlsearch'|.

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

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

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

-  """ `AndrewRadev/splitjoin.vim`

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

+  """" `AndrewRadev/splitjoin.vim`

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

-  """ `AndrewRadev/switch.vim`

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

+  """" `AndrewRadev/switch.vim`

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

   let g:switch_custom_definitions = [{

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

@@ -600,66 +615,71 @@ if has('eval')

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

   \ }]

-  "" Insert mode

+  """ Insert mode

-  """ `tpope/vim-endwise`

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

+  """" `tpope/vim-endwise`

+  GitAdd https://github.com/tpope/vim-endwise

-  """ `jiangmiao/auto-pairs`

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

+  """" `jiangmiao/auto-pairs`

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

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

   let g:AutoPairsCenterLine = 0

   let g:AutoPairsMultilineClose = 0

-  "" Command-line mode

+  """ Command-line mode

-  """ `tpope/vim-rsi`

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

+  """" `tpope/vim-rsi`

+  GitAdd https://github.com/tpope/vim-rsi

-  """ `tpope/vim-abolish`

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

+  """" `tpope/vim-abolish`

+  GitAdd https://github.com/tpope/vim-abolish

-  "" Operators

+  """ Operators

-  """ `tpope/vim-surround`

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

+  """" `tpope/vim-surround`

+  GitAdd https://github.com/tpope/vim-surround

-  """ `tpope/vim-commentary`

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

+  """" `tpope/vim-commentary`

+  GitAdd https://github.com/tpope/vim-commentary

-  """ `tommcdo/vim-lion`

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

+  """" `tommcdo/vim-lion`

+  GitAdd https://github.com/tommcdo/vim-lion

   let g:lion_squeeze_spaces = 1

-  """ `tommcdo/vim-nowchangethat`

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

+  """" `tommcdo/vim-nowchangethat`

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

-  "" Motions / text objects

+  """ Motions / text objects

+  " TODO: Check that none of the later ones are not already defined by

+  " `targets.vim`.

-  """ `wellle/targets.vim`

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

+  """" `wellle/targets.vim`

+  GitAdd https://github.com/wellle/targets.vim

-  """ `bkad/CamelCaseMotion`

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

+  """" `bkad/CamelCaseMotion`

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

   let g:camelcasemotion_key = '<Space>'

-  """ `tommcdo/vim-exchange`

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

+  """" `tommcdo/vim-exchange`

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

+

+  """" `qstrahl/vim-dentures`

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

-  """ `qstrahl/vim-dentures`

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

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

+  GitAdd https://github.com/kana/vim-textobj-user

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

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

+  " All later plugins in the "Motions / text objects" category depend on this

+  " plugin. See https://github.com/kana/vim-textobj-user/wiki.

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

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

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

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

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

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

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

+  GitAdd https://github.com/kana/vim-textobj-line

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

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

@@ -669,19 +689,31 @@ if has('eval')

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

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

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

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

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

+  GitAdd https://github.com/kana/vim-textobj-fold

+

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

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

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

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

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

+  GitAdd https://github.com/kana/vim-textobj-function

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

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

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

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

-  "" Colors

+  """" `adriaanzon/vim-textobj-matchit`

+  GitAdd https://github.com/adriaanzon/vim-textobj-matchit

-  """ `gruvbox-community/gruvbox`

-  PackAdd https://github.com/gruvbox-community/gruvbox

+  """" `rhysd/vim-textobj-continuous-line`

+  GitAdd https://github.com/rhysd/vim-textobj-continuous-line

+

+  """" `rsrchboy/vim-textobj-heredocs`

+  GitAdd https://github.com/rsrchboy/vim-textobj-heredocs

+

+  """ Colors

+

+  """" `gruvbox-community/gruvbox`

+  GitAdd https://github.com/gruvbox-community/gruvbox

   let g:gruvbox_contrast_dark = 'hard'

   let g:gruvbox_invert_selection = 0

@@ -693,68 +725,95 @@ if has('eval')

     colorscheme gruvbox

   endif

-  "" Windows

+  """ Windows

-  """ `moll/vim-bbye`

-  PackAdd https://github.com/moll/vim-bbye

+  """" `moll/vim-bbye`

+  GitAdd https://github.com/moll/vim-bbye

-  "" Folds

+  """ Folds

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

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

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

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

-  "" Undo

+  """ Undo

-  """ `mbbill/undotree`

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

+  """" `mbbill/undotree`

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

-  "" QuickFix

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

-  """ Built-in `cfilter`

+  " let g:undotree_HighlightChangedText = 0

+  " let g:undotree_DiffCommand = 'diff -u'

+

+  """ QuickFix

+

+  """" Built-in `cfilter`

   packadd! cfilter

-  "" Modelines

+  """ Modelines

+

+  """" `ypcrts/securemodelines`

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

-  """ `ypcrts/securemodelines`

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

+  """ Environment interaction

-  "" Operating system interaction

+  """" Built-in `netrw`

-  """ `ctrlpvim/ctrlp.vim`

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

+  " Netrw versions (roughly) 162h to 170 break `gx`. Never download the remote

+  " file to a temporary. See

+  " - https://github.com/vim/vim/issues/1386

+  " - https://github.com/vim/vim/issues/4738

+  " - https://github.com/vim/vim/pull/7188

+  let g:netrw_nogx = 1

+  nnoremap <silent> gx  :call netrw#BrowseX(netrw#GX(), 0)<CR>

+  xnoremap <silent> gx y:call netrw#BrowseX(@",         0)<CR>

+

+  """" `ctrlpvim/ctrlp.vim`

+  GitAdd https://github.com/ctrlpvim/ctrlp.vim

   let g:ctrlp_working_path_mode = ''

   let g:ctrlp_match_current_file = 1

-  let g:ctrlp_follow_symlinks = 1

+  let g:ctrlp_follow_symlinks = 2

   let g:ctrlp_show_hidden = 1

   let g:ctrlp_status_func = ''

   let g:ctrlp_line_prefix = ''

   let g:ctrlp_use_caching = 0

-  let g:ctrlp_max_files = 10000 " Default 10000.

+  let g:ctrlp_use_readdir = 0 " Respect 'wildignore'.

+  let g:ctrlp_max_files = 0 " Default 10000.

   let g:ctrlp_max_depth = 40 " Default 40.

+  " let g:ctrlp_user_command_async = 1

   if has('unix')

-    let g:ctrlp_user_command = 'find -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 -exec grep -Il . {} +' .

-    \ ' 2> /dev/null' .

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

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

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

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

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

+    " " \ ' \(' .

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

+    " " \ ' \)' .

   endif

-  """ `tpope/vim-fugitive`

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

+  """" `tpope/vim-fugitive`

+  GitAdd https://github.com/tpope/vim-fugitive

   autocmd vimrc FileType fugitiveblame call fugitive#MapJumps()

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

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

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

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

-  """ `tpope/vim-dispatch`

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

+  """" `tpope/vim-dispatch`

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

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

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

@@ -762,29 +821,29 @@ if has('eval')

   nnoremap <Space>ma :Make all<CR>

   nnoremap <Space>mt :Make test<CR>

-  """ `tpope/vim-eunuch`

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

+  """" `tpope/vim-eunuch`

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

-  """ `tpope/vim-projectionist`

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

+  """" `tpope/vim-projectionist`

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

-  "" Debugging

+  """ Debugging

-  """ `puremourning/vimspector`

-  " PackAdd https://github.com/puremourning/vimspector

+  """" `puremourning/vimspector`

+  " GitAdd https://github.com/puremourning/vimspector

   " Debug Adapter Protocol (DAP) client. See

   " https://microsoft.github.io/debug-adapter-protocol/.

-  """ `vim-vdebug/vdebug`

-  " PackAdd https://github.com/vim-vdebug/vdebug

+  """" `vim-vdebug/vdebug`

+  " GitAdd https://github.com/vim-vdebug/vdebug

   " Common DeBugGer Protocol (DBGP) client. See

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

 endif " has('eval')

-"" Syntax

+"" Syntax and file type

 if has('eval')

   syntax enable

   filetype plugin indent on

@@ -792,21 +851,8 @@ endif

 "" File type overrides

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

-" completion has been defined.

-autocmd vimrc FileType *

-\ if &omnifunc == '' |

-\   setlocal omnifunc=syntaxcomplete#Complete |

-\ endif |

-

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

-" autocmd vimrc FileType *        UnobtrusiveFoldComment

-" autocmd vimrc FileType markdown UnobtrusiveFoldChar #

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

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

-

 autocmd vimrc FileType vim

-\ setlocal formatoptions-=r

+\ setlocal keywordprg=:help formatoptions-=r

 autocmd vimrc FileType help

 \ setlocal nolist

@@ -817,6 +863,17 @@ autocmd vimrc FileType man

 autocmd vimrc FileType c,cpp

 \ setlocal commentstring=//\ %s

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

+" completion has been defined.

+autocmd vimrc FileType *

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