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

 """ Run

 " File.

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

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

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

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

 " Command.

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

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

 """ Make

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 if has('quickfix')

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

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

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

 """ Diffs

 " Current file.

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

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

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

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

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

 \   mkview |

 \ endif |

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

+autocmd vimrc WinEnter,TerminalWinOpen *

+\ if &buftype !=# '' |

+\   silent setlocal nolist nospell |

+\ endif

+

 "" Colors

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

 " are CIELCHuv lightness 20, 60 and 80.

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

 " bold white todos.

 if !has('gui_running')

-  autocmd vimrc VimEnter,ColorScheme,OptionSet *

+  autocmd vimrc VimEnter,ColorScheme *

   \ highlight! Normal guibg=NONE |

 endif

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

-autocmd vimrc VimEnter,ColorScheme,OptionSet *

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

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

+autocmd vimrc VimEnter,ColorScheme *

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

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

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

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

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

 """" Diffs

-autocmd vimrc VimEnter,ColorScheme,OptionSet *

+autocmd vimrc VimEnter,ColorScheme *

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

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

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

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

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

 """" Comments

-autocmd vimrc VimEnter,ColorScheme,OptionSet *

+autocmd vimrc VimEnter,ColorScheme *

 \ highlight! Comment guifg=#919191 ctermfg=Grey

 """" Folds

-autocmd vimrc VimEnter,ColorScheme,OptionSet *

+autocmd vimrc VimEnter,ColorScheme *

 \ highlight! link Folded Comment |

 """" |'listchars'|

-autocmd vimrc VimEnter,ColorScheme,OptionSet *

+autocmd vimrc VimEnter,ColorScheme *

 \ highlight! link SpecialKey Special |

 \ highlight! link NonText    Special |

 """" Vim comments

-autocmd vimrc VimEnter,ColorScheme,OptionSet *

+autocmd vimrc VimEnter,ColorScheme *

 \ highlight! link vimCommentString vimComment |

 \ highlight! link vimCommentTitle  vimComment |

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

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

   """" `jyscao/vim-greprtpscr`

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

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

   """" `vimwiki/vimwiki`

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

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

 autocmd vimrc FileType vim

 \ setlocal keywordprg=:help formatoptions-=r

-autocmd vimrc FileType help

-\ setlocal nolist

-

-autocmd vimrc FileType man

-\ setlocal nolist

-

 autocmd vimrc FileType c,cpp

 \ setlocal commentstring=//\ %s

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

 autocmd vimrc FileType markdown

 \ setlocal complete+=kspell

-autocmd vimrc FileType *

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

-\   setlocal nospell nolist |

-\ endif |

+autocmd vimrc FileType man

+\ setlocal nolist nospell

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

 " completion has been defined.