From e5c579a8f74dc2dbb19f4468597f16bc97fd27d0 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Wed, 5 Sep 2018 11:40:27 +1200
Subject: Scrap the nvim.vim runtime include

It's overkill; just add comments explaining why we're setting what the
Vim default is.
---
 Makefile     |  1 -
 vim/nvim.vim |  7 -------
 vim/vimrc    | 14 +++++++++-----
 3 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 vim/nvim.vim

diff --git a/Makefile b/Makefile
index a19e87d8..833f4ac9 100644
--- a/Makefile
+++ b/Makefile
@@ -513,7 +513,6 @@ install-neovim:
 		VIM=nvim \
 		VIMDIR="$${XDG_CONFIG_HOME:-"$$HOME"/.config}/nvim" \
 		VIMRC="$${XDG_CONFIG_HOME:="$$HOME"/.config}/nvim/init.vim"
-	cp -p -- vim/nvim.vim "$${XDG_CONFIG_HOME:-"$$HOME"/.config}/nvim"
 
 install-vim-after: install-vim-after-ftplugin \
 	install-vim-after-indent \
diff --git a/vim/nvim.vim b/vim/nvim.vim
deleted file mode 100644
index 3ad54f57..00000000
--- a/vim/nvim.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-" Configuration specific to NeoVim
-
-" Don't show a statusline if there's only one window
-set laststatus=1
-
-" Disable command line display of file position
-set noruler
diff --git a/vim/vimrc b/vim/vimrc
index 3eb6236f..2f60a31b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -95,6 +95,7 @@ if has('multi_byte') && !exists('$LANG') && &encoding ==# 'latin1'
 endif
 
 " Don't wait for a key after Escape in insert mode
+" In vim-tiny but not NeoVim, so just suppress errors
 silent! set noesckeys
 
 " Fold based on indent, but only when I ask
@@ -137,6 +138,10 @@ set incsearch
 " Don't join lines with two spaces at the end of sentences
 set nojoinspaces
 
+" Don't show a statusline if there's only one window
+" This is the Vim default, but NeoVim changed it
+set laststatus=1
+
 " Don't redraw the screen during batch execution
 set lazyredraw
 
@@ -160,6 +165,10 @@ set nrformats-=octal
 set path-=/usr/include  " Let the C/C++ filetypes set that
 set path+=**            " Search current directory's whole tree
 
+" Disable command line display of file position
+" This is the Vim default, but NeoVim changed it
+set noruler
+
 " Make sessions usable
 if exists('+sessionoptions')
   set sessionoptions-=localoptions  " No buffer options or mappings
@@ -421,10 +430,5 @@ nnoremap <Bslash>: ^"zyg_:<C-R>z<CR>
 " \! executes line with 'shell'
 nnoremap <Bslash>! ^"zyg_:!<C-R>z<CR>
 
-" If we're running NeoVim, source some extra configuration
-if has('nvim')
-  runtime nvim.vim
-endif
-
 " Source any .vim files from ~/.vim/config
 runtime! config/*.vim
-- 
cgit v1.2.3