aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-25 18:05:22 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-25 18:05:22 +1200
commite175cf24bfcc93bc0335f1c8ca5208290834a879 (patch)
tree9ed588fb0c75413961342428d2d68aa1c2acab4d
parentMerge branch 'release/v4.48.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-e175cf24bfcc93bc0335f1c8ca5208290834a879.tar.gz
dotfiles-e175cf24bfcc93bc0335f1c8ca5208290834a879.zip
Merge branch 'release/v4.49.0'v4.49.0
* release/v4.49.0: Bump VERSION Update vim-toggle-flags to v2.0.0 Update vim-strip-trailing-whitespace to v3.0.0 Update vim-big-file-options to v2.0.0 Update vim-regex-escape to v1.0.0 Adjust some conditionals a bit more Tolerate smart quotes in g'day Rearrange spacebar mapping Use plain :set for 'viminfofile'
-rw-r--r--VERSION4
-rw-r--r--vim/after/ftplugin/mail.vim2
m---------vim/bundle/big_file_options0
m---------vim/bundle/regex_escape0
m---------vim/bundle/strip_trailing_whitespace0
m---------vim/bundle/toggle_flags0
-rw-r--r--vim/vimrc29
7 files changed, 17 insertions, 18 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
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\+'
diff --git a/vim/bundle/big_file_options b/vim/bundle/big_file_options
-Subproject 0cfc0f7ca6371539f1d81874137e61e3faf70a7
+Subproject b7fa83df2c41e795b4c704f0ba3a77c6cbccd97
diff --git a/vim/bundle/regex_escape b/vim/bundle/regex_escape
-Subproject 7414c6e26a04f2901c131cafc9fb9ebe9b54380
+Subproject 745dc4060a75bd0b1ec4f0667a309de61cf1d66
diff --git a/vim/bundle/strip_trailing_whitespace b/vim/bundle/strip_trailing_whitespace
-Subproject 28a22be4942c8af5fec969b2f4cf2edae331fe4
+Subproject c8d73a50108d3d7e21f50a2aa3234dbb3c00b99
diff --git a/vim/bundle/toggle_flags b/vim/bundle/toggle_flags
-Subproject 3c7ea4620f20ef87a777597329ca69f8c3a0e70
+Subproject e1dca20336cca8ec48a0d128595698caf71b5bd
diff --git a/vim/vimrc b/vim/vimrc
index aede100c..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')
@@ -182,7 +181,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
@@ -238,11 +237,11 @@ catch
set background=dark
endtry
-" Remap normal space to scroll down a page
-nnoremap <Space> <PageDown>
-" 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 <Space> <Plug>(ScrollNext)
+else
+ nnoremap <Space> <PageDown>
endif
" Remap insert Ctrl-C to undo the escaped insert operation