From 2df57d8e7df54199a08f657aa67c9c61ef1535fc Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 15 May 2019 13:10:41 +1200 Subject: Use consistent version support specification --- vim/vimrc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index dbdda4e3..86ed4d8e 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -43,7 +43,7 @@ set backspace+=indent " Spaces from 'autoindent' set backspace+=start " The start of current insertion " Try to keep backups in one system-appropriate dir, including full encoded -" path in filename (trailing double slash) if supported (8.1.0251) +" path in filename (trailing double slash) if supported (v8.1.251) set backup if v:version > 801 \ || v:version == 801 && has('patch251') @@ -59,7 +59,7 @@ if has('unix') set backupskip^=/var/tmp/* " Hardcoded path for `sudo -e` endif -" Indent wrapped lines if supported +" Indent wrapped lines if supported (v7.4.338) if exists('+breakindent') set breakindent endif @@ -100,13 +100,13 @@ endif set foldlevelstart=99 set foldmethod=indent -" Delete comment leaders when joining lines, if supported +" Delete comment leaders when joining lines, if supported (v7.3.541) if v:version > 703 \ || v:version == 703 && has('patch541') set formatoptions+=j endif -" Don't break a single space after a period, if supported +" Don't break a single space after a period, if supported (v8.1.728) if v:version > 801 \ || v:version == 801 && has('patch728') set formatoptions+=p @@ -134,7 +134,7 @@ set include= set incsearch " Don't show a statusline if there's only one window -" This is the Vim default, but NeoVim changed it +" This is Vim's default, but not NeoVim's if &laststatus != 1 set laststatus=1 endif @@ -163,7 +163,7 @@ 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 +" This is Vim's default, but not NeoVim's if &ruler set noruler endif @@ -188,8 +188,8 @@ if &ttymouse !=# '' set ttymouse= endif -" Try to keep persistent undo files in one system-appropriate dir, including -" full encoded path in filename (trailing double slash) +" Try to keep persistent undo files in one system-appropriate dir (v7.2.438), +" including full encoded path in filename (trailing double slash) if has('persistent_undo') set undofile set undodir^=$MYVIMRUNTIME/cache/undo// @@ -199,7 +199,7 @@ endif set wildmenu " Use wildmenu set wildmode=list:longest " Tab press completes and lists if exists('+wildignorecase') - set wildignorecase " Case insensitive, if supported + set wildignorecase " Case insensitive, if supported (v7.3.072) endif " Let me move beyond buffer text in visual block mode -- cgit v1.2.3 From efda0db46ab80d1a78a838885274cc606c3fa5e4 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 15 May 2019 13:24:31 +1200 Subject: Revert "Remove redundant :pwd from mapping" This reverts commit e5073155edd4fc8fa006ce35a060ddb41c32d17c. The :cd command doesn't seem to print the current directory, at least not consistently. It might be version-dependent. Using :pwd after the change ensures it will be displayed. --- vim/vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/vimrc b/vim/vimrc index 86ed4d8e..a194f137 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -279,7 +279,7 @@ nnoremap f :setlocal formatoptions? nnoremap F :doautocmd filetypedetect BufRead " \g changes directory to the current file's location -nnoremap g :cd %:h +nnoremap g :cd %:h:pwd " \h toggles highlighting search results nnoremap h :set hlsearch! hlsearch? -- cgit v1.2.3 From 94c8d6c527049984373d75c1f8910fe25f8736b4 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 15 May 2019 14:04:07 +1200 Subject: Try ternary operator for $MYVIMRUNTIME setting Not sure about this just yet. --- vim/vimrc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index a194f137..7e34369b 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -6,11 +6,11 @@ runtime system.vim " Set an environment variable for the user runtime directory if !exists('$MYVIMRUNTIME') - if has('win32') || has('win64') - let $MYVIMRUNTIME = expand('~/vimfiles') - else - let $MYVIMRUNTIME = expand('~/.vim') - endif + let $MYVIMRUNTIME = expand( + \ has('win32') || has('win64') + \ ? '~/vimfiles' + \ : '~/.vim' + \ ) endif " Load filetype settings, plugins, and maps -- cgit v1.2.3 From cef341bf75f524d62490e4f47e0d3ab6852b384e Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 15 May 2019 19:19:16 +1200 Subject: Turns out I'm not actually using 'wildmenu' The 'wildmenu' option specifically means the interactive menu above the completing text, which only shows if 'wildmode' contains the `full` flag. Because I use a value that doesn't, this setting is unneeded. --- vim/vimrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 7e34369b..915b02b0 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -195,8 +195,7 @@ if has('persistent_undo') set undodir^=$MYVIMRUNTIME/cache/undo// endif -" Wildmenu settings; see also plugin/wildignore.vim -set wildmenu " Use wildmenu +" Tab completion settings; see also plugin/wildignore.vim set wildmode=list:longest " Tab press completes and lists if exists('+wildignorecase') set wildignorecase " Case insensitive, if supported (v7.3.072) -- cgit v1.2.3 From 3c3b1bf3b02d0d53ea725057e8743e2b1919bd38 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 16 May 2019 13:16:18 +1200 Subject: Update to vim-perl-version-bump v1.1.2 --- vim/bundle/perl_version_bump | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/perl_version_bump b/vim/bundle/perl_version_bump index e28fe8b7..660609b9 160000 --- a/vim/bundle/perl_version_bump +++ b/vim/bundle/perl_version_bump @@ -1 +1 @@ -Subproject commit e28fe8b762612978f1096b82f5387af7e13cd16d +Subproject commit 660609b99f6e82c769096f6bd3b6d0a615c3ebc1 -- cgit v1.2.3 From 8f581b83461bde2d2ad88593e3c8cfb3b377b36d Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 16 May 2019 13:16:29 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index a208ef25..bf278408 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v4.27.0 -Mon May 13 23:52:55 UTC 2019 +tejr dotfiles v4.28.0 +Thu May 16 01:16:29 UTC 2019 -- cgit v1.2.3