aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-09-05 12:00:16 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-09-05 12:00:16 +1200
commitb19b04fc4ce2403187f307bb11c559274573f7f8 (patch)
tree5e437107a9b467aee671d594c4c08a5f32e6e004
parent8026190c39d8cecdd7179cb1db35e0c72c1f4340 (diff)
parent08813ac13aae7e59bf562ef41fe0676bdff6eaa4 (diff)
downloaddotfiles-b19b04fc4ce2403187f307bb11c559274573f7f8.tar.gz
Merge branch 'release/v1.67.0'v1.67.0
* release/v1.67.0: Bump VERSION Update vertical_region.vim plugin Scrap the nvim.vim runtime include Correct a comment in vim/plugin/dist.vim Require at least one char in ftdetect filenames
-rw-r--r--Makefile1
-rw-r--r--VERSION4
m---------vim/bundle/vertical_region0
-rw-r--r--vim/ftdetect/perl.vim6
-rw-r--r--vim/nvim.vim7
-rw-r--r--vim/plugin/dist.vim2
-rw-r--r--vim/vimrc14
7 files changed, 15 insertions, 19 deletions
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/VERSION b/VERSION
index 4f8ec31c..73d06721 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.66.0
-Mon Sep 3 23:46:26 UTC 2018
+tejr dotfiles v1.67.0
+Wed Sep 5 00:00:16 UTC 2018
diff --git a/vim/bundle/vertical_region b/vim/bundle/vertical_region
-Subproject f7989e2bdd4ed6630cc7318296a6a25f594f1f7
+Subproject 14c91a98d63d74a81542af565af6a67377c5136
diff --git a/vim/ftdetect/perl.vim b/vim/ftdetect/perl.vim
index 95830b0b..887a9fb6 100644
--- a/vim/ftdetect/perl.vim
+++ b/vim/ftdetect/perl.vim
@@ -1,9 +1,9 @@
" If it's a new file in a bin, libexec, or scripts subdir that has a
" Makefile.PL sibling, and I'm editing it, it's almost definitely Perl.
autocmd filetypedetect BufNewFile
- \ */bin/*
- \,*/libexec/*
- \,*/scripts/*
+ \ ?*/bin/?*
+ \,?*/libexec/?*
+ \,?*/scripts/?*
\ if filereadable(expand('<afile>:p:h:h') . '/Makefile.PL')
\| setfiletype perl
\|endif
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/plugin/dist.vim b/vim/plugin/dist.vim
index f9cc6d18..eb814387 100644
--- a/vim/plugin/dist.vim
+++ b/vim/plugin/dist.vim
@@ -2,7 +2,7 @@
" I manage plugins myself with Git and a Makefile
let g:loaded_getscriptPlugin = 1
let g:loaded_vimballPlugin = 1
-" Vim is the wrong tool for reading archives or compressed text
+" Vim is the wrong tool for reading archives
let g:loaded_tarPlugin = 1
let g:loaded_zipPlugin = 1
" I prefer filtering text with Unix tools
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