aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-12-30 01:21:40 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-12-30 01:21:40 +1300
commite103c90d1eecafc2b46c26e52d669a0593a16a97 (patch)
treec0d3a2777aded45cd76a36895a91fe0ea1ce56ed
parent8215cba30d96b421ff0b434b5900fa60af5e1a4b (diff)
parent7df9c9b275a9719b75785e7702eecc847a2c39c8 (diff)
downloaddotfiles-4.2.0.tar.gz
Merge branch 'release/v4.2.0'v4.2.0
* release/v4.2.0: Bump VERSION Update vertical_region.vim to v1.0.0 Update regex_escape.vim to v1.0.2 Update replace_operator.vim to v1.0.2 Update regex_escape.vim plugin to 0.1.1 Choose regex character classes for some filetypes Add regex_escape.vim plugin Update quickfix_auto_open.vim plugin to v0.2.0
-rw-r--r--.gitmodules3
-rw-r--r--VERSION4
-rw-r--r--vim/after/ftplugin/perl.vim4
-rw-r--r--vim/after/ftplugin/php.vim4
-rw-r--r--vim/after/ftplugin/vim.vim4
m---------vim/bundle/quickfix_auto_open0
m---------vim/bundle/regex_escape0
m---------vim/bundle/replace_operator0
m---------vim/bundle/vertical_region0
-rw-r--r--vim/ftplugin/awk.vim4
-rw-r--r--vim/vimrc16
11 files changed, 31 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules
index f13f3697..350261c6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -44,6 +44,9 @@
[submodule "vim/bundle/redact_pass"]
path = vim/bundle/redact_pass
url = https://sanctum.geek.nz/code/vim-redact-pass.git
+[submodule "vim/bundle/regex_escape"]
+ path = vim/bundle/regex_escape
+ url = https://sanctum.geek.nz/code/vim-regex-escape.git
[submodule "vim/bundle/replace_operator"]
path = vim/bundle/replace_operator
url = https://sanctum.geek.nz/code/vim-replace-operator.git
diff --git a/VERSION b/VERSION
index 07261313..8c8f6bc7 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v4.1.0
-Thu Dec 27 11:13:06 UTC 2018
+tejr dotfiles v4.2.0
+Sat Dec 29 12:21:40 UTC 2018
diff --git a/vim/after/ftplugin/perl.vim b/vim/after/ftplugin/perl.vim
index 5dd2b7bb..bcee97d6 100644
--- a/vim/after/ftplugin/perl.vim
+++ b/vim/after/ftplugin/perl.vim
@@ -8,6 +8,10 @@ let b:undo_ftplugin .= '|unlet b:current_compiler'
setlocal matchpairs+=<:>
let b:undo_ftplugin .= '|setlocal matchpairs<'
+" Specify ERE regex (close to perlre) for regex_escape.vim
+let b:regex_escape_flavor = 'ere'
+let b:undo_ftplugin .= '|unlet b:regex_escape_flavor'
+
" Stop here if the user doesn't want ftplugin mappings
if exists('g:no_plugin_maps') || exists('g:no_perl_maps')
finish
diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim
index ee0ce5c8..801f1c76 100644
--- a/vim/after/ftplugin/php.vim
+++ b/vim/after/ftplugin/php.vim
@@ -12,6 +12,10 @@ let b:undo_ftplugin .= '|setlocal comments< formatoptions<'
setlocal keywordprg=pman
let b:undo_ftplugin .= '|setlocal keywordprg<'
+" Specify ERE regex (close to PCRE) for regex_escape.vim
+let b:regex_escape_flavor = 'ere'
+let b:undo_ftplugin .= '|unlet b:regex_escape_flavor'
+
" Stop here if the user doesn't want ftplugin mappings
if exists('g:no_plugin_maps') || exists('g:no_php_maps')
finish
diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim
index a7a69993..905d21dc 100644
--- a/vim/after/ftplugin/vim.vim
+++ b/vim/after/ftplugin/vim.vim
@@ -5,6 +5,10 @@ if bufname('%') !=# 'command-line'
\ . '|setlocal errorformat< makeprg<'
endif
+" Specify Vim pattern flavor for regex_escape.vim
+let b:regex_escape_flavor = 'vim'
+let b:undo_ftplugin .= '|unlet b:regex_escape_flavor'
+
" Stop here if the user doesn't want ftplugin mappings
if exists('g:no_plugin_maps') || exists('g:no_vim_maps')
finish
diff --git a/vim/bundle/quickfix_auto_open b/vim/bundle/quickfix_auto_open
-Subproject a2eccef1861e2c0be988bc182d7b14be94ebc9e
+Subproject 2347ea43e5078932663fe46e6ff9e35de54765a
diff --git a/vim/bundle/regex_escape b/vim/bundle/regex_escape
new file mode 160000
+Subproject 2ffca0318642b6ee3bfd3ef36fd59244c8f48fa
diff --git a/vim/bundle/replace_operator b/vim/bundle/replace_operator
-Subproject d897f61790f31c71564a761c79b8839e76192d7
+Subproject e6327bb5d4a0310e236d2b233affef4cfb18d5b
diff --git a/vim/bundle/vertical_region b/vim/bundle/vertical_region
-Subproject 14c91a98d63d74a81542af565af6a67377c5136
+Subproject 67136f00965612823a638bc2bef7a493703de66
diff --git a/vim/ftplugin/awk.vim b/vim/ftplugin/awk.vim
index 9627941d..663ba810 100644
--- a/vim/ftplugin/awk.vim
+++ b/vim/ftplugin/awk.vim
@@ -8,3 +8,7 @@ let b:did_ftplugin = 1
setlocal comments=:#
setlocal formatoptions+=or
let b:undo_ftplugin = 'setlocal comments< formatoptions<'
+
+" Specify ERE flavor for regex_escape.vim
+let b:regex_escape_flavor = 'ere'
+let b:undo_ftplugin .= '|unlet b:regex_escape_flavor'
diff --git a/vim/vimrc b/vim/vimrc
index 122a108d..f290b144 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -393,18 +393,22 @@ onoremap <Leader>_ :<C-U>normal! `[v`]<CR>
onoremap <Leader>% :<C-U>normal! 1GVG<CR>
" \{ and \} move to lines with non-space chars before current column
-nmap <Leader>{ <Plug>(VerticalRegionUpNormal)
-nmap <Leader>} <Plug>(VerticalRegionDownNormal)
-omap <Leader>{ <Plug>(VerticalRegionUpOperator)
-omap <Leader>} <Plug>(VerticalRegionDownOperator)
-xmap <Leader>{ <Plug>(VerticalRegionUpVisual)
-xmap <Leader>} <Plug>(VerticalRegionDownVisual)
+nmap <Leader>{ <Plug>(VerticalRegionUp)
+nmap <Leader>} <Plug>(VerticalRegionDown)
+omap <Leader>{ <Plug>(VerticalRegionUp)
+omap <Leader>} <Plug>(VerticalRegionDown)
+xmap <Leader>{ <Plug>(VerticalRegionUp)
+xmap <Leader>} <Plug>(VerticalRegionDown)
" \/ types :vimgrep for me ready to enter a search pattern
nnoremap <Leader>/ :<C-U>vimgrep /\c/j **<S-Left><S-Left><Right>
" \? types :helpgrep for me ready to enter a search pattern
nnoremap <Leader>? :<C-U>helpgrep \c<S-Left>
+" \\ escapes regex metacharacters
+nmap <Leader>\ <Plug>(RegexEscape)
+xmap <Leader>\ <Plug>(RegexEscape)
+
" \DEL deletes the current buffer
nnoremap <Leader><Delete> :bdelete<CR>
" \INS edits a new buffer