From 55e74da96316ba7450dda07d35b0525f83386cb6 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 25 May 2019 02:51:12 +1200 Subject: Use plain :set for 'viminfofile' --- vim/vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/vimrc b/vim/vimrc index aede100c..8a4e16d9 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -182,7 +182,7 @@ endif " getting clobbered when something runs Vim without using this vimrc let $VIMINFO = $MYVIM.'/viminfo' if exists('+viminfofile') " Use new option method if we can (v8.1.716) - let &viminfofile = $VIMINFO + set viminfofile=$VIMINFO else " Resort to clunkier method with 'viminfo' option flag execute 'set viminfo+=n'.escape($VIMINFO, '\ ') endif -- cgit v1.2.3 From 4c8a76e7af12d31cde8bebe385d6e779c399298c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 25 May 2019 02:57:00 +1200 Subject: Rearrange spacebar mapping --- vim/vimrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 8a4e16d9..3a686b39 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -238,11 +238,11 @@ catch set background=dark endtry -" Remap normal space to scroll down a page -nnoremap -" Do a :next after hitting the last line -if &loadplugins " Don't change the mapping if we won't be loading the plugin +" Space bar scrolls down a page, :next if plugin available +if &loadplugins nmap (ScrollNext) +else + nnoremap endif " Remap insert Ctrl-C to undo the escaped insert operation -- cgit v1.2.3 From 7c497dd17795f192c9b5df2d184491ec9442cff1 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 25 May 2019 14:41:30 +1200 Subject: Tolerate smart quotes in g'day My dad just sent me one. --- vim/after/ftplugin/mail.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim index 2e63c449..76605d03 100644 --- a/vim/after/ftplugin/mail.vim +++ b/vim/after/ftplugin/mail.vim @@ -15,7 +15,7 @@ if line('.') == 1 && col('.') == 1 while getline('.') =~? '^> *' \ . '\%(' \ . '\%(' - \ . 'g''\=day' + \ . 'g[''’]\=day' \ . '\|\%(good \)\=\%(morning\|afternoon\|evening\)' \ . '\|h[eu]\%(ll\|rr\)o\+' \ . '\|hey\+' -- cgit v1.2.3 From 4996972417ba1ec32df0decd591a61e796875e67 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 25 May 2019 15:08:19 +1200 Subject: Adjust some conditionals a bit more --- vim/vimrc | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 3a686b39..e93bd4e3 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -14,22 +14,21 @@ set shiftwidth=4 " Indent with four spaces " Make insert mode tab key add the same number of spaces as 'shiftwidth', use " negative value to do this if Vim new enough to support it -let &softtabstop = - \ v:version > 703 || v:version == 703 && has('patch693') - \ ? -1 - \ : &shiftwidth +let &softtabstop = v:version > 703 + \ || v:version == 703 && has('patch693') + \ ? -1 : &shiftwidth " Restore insert mode 'backspace' limits to the stringent Vim default, if a " system vimrc or Neovim has messed with it set backspace= -" Keep backup files in dedicated directory +" Keep backup files in dedicated directory; add trailing double-slash to keep +" full path in name, if Vim is new enough to support that set backup -if has('patch-8.1.251') " Can keep full path in filename - set backupdir^=$MYVIM/cache/backup// -else - set backupdir^=$MYVIM/cache/backup -endif +execute 'set backupdir^=' + \ . escape($MYVIM, '\ ') + \ . '/cache/backup' + \ . (has('patch-8.1.251') ? '//' : '') " Add some *nix paths not to back up if has('unix') -- cgit v1.2.3 From 2526b0dd4b08e7ecab87fe099672dba871601d8b Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 25 May 2019 17:12:23 +1200 Subject: Update vim-regex-escape to v1.0.0 --- vim/bundle/regex_escape | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/regex_escape b/vim/bundle/regex_escape index 7414c6e2..745dc406 160000 --- a/vim/bundle/regex_escape +++ b/vim/bundle/regex_escape @@ -1 +1 @@ -Subproject commit 7414c6e26a04f2901c131cafc9fb9ebe9b543808 +Subproject commit 745dc4060a75bd0b1ec4f0667a309de61cf1d668 -- cgit v1.2.3 From 6bcd407e780f319a11ea32a1ca997dbba564593a Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 25 May 2019 17:34:40 +1200 Subject: Update vim-big-file-options to v2.0.0 --- vim/bundle/big_file_options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/big_file_options b/vim/bundle/big_file_options index 0cfc0f7c..b7fa83df 160000 --- a/vim/bundle/big_file_options +++ b/vim/bundle/big_file_options @@ -1 +1 @@ -Subproject commit 0cfc0f7ca6371539f1d81874137e61e3faf70a7d +Subproject commit b7fa83df2c41e795b4c704f0ba3a77c6cbccd97e -- cgit v1.2.3 From 76a99c641bf03e5eea4ad5d9880714568d539317 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 25 May 2019 17:54:20 +1200 Subject: Update vim-strip-trailing-whitespace to v3.0.0 --- vim/bundle/strip_trailing_whitespace | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/strip_trailing_whitespace b/vim/bundle/strip_trailing_whitespace index 28a22be4..c8d73a50 160000 --- a/vim/bundle/strip_trailing_whitespace +++ b/vim/bundle/strip_trailing_whitespace @@ -1 +1 @@ -Subproject commit 28a22be4942c8af5fec969b2f4cf2edae331fe44 +Subproject commit c8d73a50108d3d7e21f50a2aa3234dbb3c00b99b -- cgit v1.2.3 From 3c8b08093400cdae2b75559d2c95a8743ac74e0c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 25 May 2019 18:02:26 +1200 Subject: Update vim-toggle-flags to v2.0.0 --- vim/bundle/toggle_flags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/toggle_flags b/vim/bundle/toggle_flags index 3c7ea462..e1dca203 160000 --- a/vim/bundle/toggle_flags +++ b/vim/bundle/toggle_flags @@ -1 +1 @@ -Subproject commit 3c7ea4620f20ef87a777597329ca69f8c3a0e708 +Subproject commit e1dca20336cca8ec48a0d128595698caf71b5bda -- cgit v1.2.3 From f3b140dc4fd6f4c0753a41646ae50286cf521fd5 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 25 May 2019 18:05:22 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 044a7e61..5e9ca7b3 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v4.48.0 -Fri May 24 14:35:29 UTC 2019 +tejr dotfiles v4.49.0 +Sat May 25 06:05:22 UTC 2019 -- cgit v1.2.3