From 9233e1b09ecb98162f19834780d057e1369080f2 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 5 Sep 2018 09:53:04 +1200 Subject: Require at least one char in ftdetect filenames --- vim/ftdetect/perl.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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(':p:h:h') . '/Makefile.PL') \| setfiletype perl \|endif -- cgit v1.2.3 From 8f8dcc51ec5a1befd8e4cdc92b16658b7486bf7a Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 5 Sep 2018 10:25:33 +1200 Subject: Correct a comment in vim/plugin/dist.vim --- vim/plugin/dist.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From e5c579a8f74dc2dbb19f4468597f16bc97fd27d0 Mon Sep 17 00:00:00 2001 From: Tom Ryder 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 : ^"zyg_:z " \! executes line with 'shell' nnoremap ! ^"zyg_:!z -" 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 From 6c79c6abd6e48777cf3a3d609c21da934557066f Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 5 Sep 2018 11:55:15 +1200 Subject: Update vertical_region.vim plugin --- vim/bundle/vertical_region | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/vertical_region b/vim/bundle/vertical_region index f7989e2b..14c91a98 160000 --- a/vim/bundle/vertical_region +++ b/vim/bundle/vertical_region @@ -1 +1 @@ -Subproject commit f7989e2bdd4ed6630cc7318296a6a25f594f1f70 +Subproject commit 14c91a98d63d74a81542af565af6a67377c51368 -- cgit v1.2.3 From 08813ac13aae7e59bf562ef41fe0676bdff6eaa4 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 5 Sep 2018 12:00:16 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3