diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-12 13:40:41 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-12 13:40:41 +1200 |
commit | 3fe26c387bd8378bbdc51e4c91ec160ed58481f7 (patch) | |
tree | c11bdcda94e7cfc890688fb128ab6f458ecf1468 | |
parent | Merge branch 'release/v1.26.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-1.27.0.tar.gz (sig) dotfiles-1.27.0.zip |
Merge branch 'release/v1.27.0'v1.27.0
* release/v1.27.0:
Bump VERSION
Include hotfixes for plugin map renames
Update and configure for perl_version_bump.vim
Update and configure for make_target.vim
Update and configure for put_blank_lines.vim
Upgrade and configure for paste_open.vim
Update and configure for strip_trailing_whitespace
Update and reconfigure for copy_linebreak.vim
Update and reconfigure for insert_cancel.vim
Update Vim plugins
Remove fixed_join.vim plugin
Upgrade cmdwin_ctrlc.vim plugin
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | vim/after/ftplugin/make.vim | 2 | ||||
-rw-r--r-- | vim/after/ftplugin/perl.vim | 4 | ||||
m--------- | vim/bundle/cmdwin_ctrlc | 0 | ||||
m--------- | vim/bundle/copy_linebreak | 0 | ||||
m--------- | vim/bundle/fixed_join | 0 | ||||
m--------- | vim/bundle/insert_cancel | 0 | ||||
m--------- | vim/bundle/insert_suspend_hlsearch | 0 | ||||
m--------- | vim/bundle/insert_timeout | 0 | ||||
m--------- | vim/bundle/make_target | 0 | ||||
m--------- | vim/bundle/paste_open | 0 | ||||
m--------- | vim/bundle/perl_version_bump | 0 | ||||
m--------- | vim/bundle/put_blank_lines | 0 | ||||
m--------- | vim/bundle/strip_trailing_whitespace | 0 | ||||
-rw-r--r-- | vim/vimrc | 21 |
16 files changed, 12 insertions, 20 deletions
diff --git a/.gitmodules b/.gitmodules index 390e7400..af225c02 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,9 +11,6 @@ [submodule "vim/bundle/copy_linebreak"] path = vim/bundle/copy_linebreak url = https://sanctum.geek.nz/code/vim-copy-linebreak.git -[submodule "vim/bundle/fixed_join"] - path = vim/bundle/fixed_join - url = https://sanctum.geek.nz/code/vim-fixed-join.git [submodule "vim/bundle/insert_cancel"] path = vim/bundle/insert_cancel url = https://sanctum.geek.nz/code/vim-insert-cancel.git @@ -1,2 +1,2 @@ -tejr dotfiles v1.26.0 +tejr dotfiles v1.27.0 Wed Jul 11 13:19:53 UTC 2018 diff --git a/vim/after/ftplugin/make.vim b/vim/after/ftplugin/make.vim index 38a2b620..3018e11b 100644 --- a/vim/after/ftplugin/make.vim +++ b/vim/after/ftplugin/make.vim @@ -9,5 +9,5 @@ if exists('g:no_plugin_maps') || exists('g:no_make_maps') endif " Set mappings -nmap <buffer> <LocalLeader>m <Plug>MakeTarget +nmap <buffer> <LocalLeader>m <Plug>(MakeTarget) let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>m' diff --git a/vim/after/ftplugin/perl.vim b/vim/after/ftplugin/perl.vim index 065a9512..2a350805 100644 --- a/vim/after/ftplugin/perl.vim +++ b/vim/after/ftplugin/perl.vim @@ -28,8 +28,8 @@ let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>c' " Bump version numbers nmap <buffer> <LocalLeader>v - \ <Plug>PerlVersionBumpMinor + \ <Plug>(PerlVersionBumpMinor) nmap <buffer> <LocalLeader>V - \ <Plug>PerlVersionBumpMajor + \ <Plug>(PerlVersionBumpMajor) let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>v' \ . '|nunmap <buffer> <LocalLeader>V' diff --git a/vim/bundle/cmdwin_ctrlc b/vim/bundle/cmdwin_ctrlc -Subproject fa1a4e8c17eebab4b9f9d05ec6ed19a45af6669 +Subproject e3b155d0a2281a96f479a4f665fd4ee5bf59dab diff --git a/vim/bundle/copy_linebreak b/vim/bundle/copy_linebreak -Subproject f6fdbf1afaae48b16a11744ba3f9ea1d3922ebb +Subproject 4d189176359f23318cb46386d4140cd7fc62912 diff --git a/vim/bundle/fixed_join b/vim/bundle/fixed_join deleted file mode 160000 -Subproject e24d47cba9efa6289867e04a12241767b880cd1 diff --git a/vim/bundle/insert_cancel b/vim/bundle/insert_cancel -Subproject ab987c9355fc4595861c194ede44a6607174464 +Subproject a2308ef31dcfad2bc01cac0b9d98571230a1b10 diff --git a/vim/bundle/insert_suspend_hlsearch b/vim/bundle/insert_suspend_hlsearch -Subproject 0b7cb75d1bd8eac9e411ee344f78608122e69d6 +Subproject e5f9e3a8985ee0e038324ce493b7b6833e92b9f diff --git a/vim/bundle/insert_timeout b/vim/bundle/insert_timeout -Subproject c50cc11e48b33187b398f1e9c7f1b1125c7e1d6 +Subproject 6cbacba5d66826497b3a136fb8d692921b47566 diff --git a/vim/bundle/make_target b/vim/bundle/make_target -Subproject 1327bf1a430b77aa38a69e4de33d92cf844f0ba +Subproject f4fe940526c9351990c9966eb6828f315c83311 diff --git a/vim/bundle/paste_open b/vim/bundle/paste_open -Subproject 8537d312627d4acff204c543927549dcbfeae8f +Subproject bd3613145539911313ed8c1f7524b571fe89233 diff --git a/vim/bundle/perl_version_bump b/vim/bundle/perl_version_bump -Subproject 3ea1890e49b064cb7e8fc1481fc70d5a4c919cc +Subproject dad3282770c101b6c0aee1af0e4f8cf0f8cb4c0 diff --git a/vim/bundle/put_blank_lines b/vim/bundle/put_blank_lines -Subproject f2d595cf0f10eae715536397e226eb3241706af +Subproject a94f0e3ceef7719d1f3baf2f381b6f8f009c646 diff --git a/vim/bundle/strip_trailing_whitespace b/vim/bundle/strip_trailing_whitespace -Subproject 1878ccd255b91ffabbe754d8b843e795fa95e03 +Subproject e689a60912a1832f167bdc88cf08cbba2a9ae7e @@ -175,13 +175,8 @@ vnoremap <silent> <C-L> :<C-U>nohlsearch<CR>gv<C-L> " Remap insert Ctrl-C to undo the escaped insert operation " Default to not-quite-correct vim-tiny-compatible map if no plugin -inoremap <Plug>InsertCancel <Esc>u -imap <C-C> <Plug>InsertCancel - -" Remap normal J to stay in place while joining lines -" Default to not-quite-correct vim-tiny-compatible map if no plugin -nnoremap <Plug>FixedJoin mzJ`z -nmap J <Plug>FixedJoin +inoremap <Plug>(InsertCancel) <Esc>u +imap <C-C> <Plug>(InsertCancel) " Remap normal/visual space to scroll down a page, backspace up nnoremap <Space> <C-F> @@ -214,15 +209,15 @@ nnoremap [t :<C-U>tabprevious<CR> nnoremap ]t :<C-U>tabnext<CR> " Insert blank lines around current line -nmap [<Space> <Plug>PutBlankLinesAbove -nmap ]<Space> <Plug>PutBlankLinesBelow +nmap [<Space> <Plug>(PutBlankLinesAbove) +nmap ]<Space> <Plug>(PutBlankLinesBelow) " Normal leader maps; use <Bslash> not <Leader> for vim-tiny " \a toggles 'formatoptions' 'a' flag using a plugin nnoremap <Bslash>a :<C-U>ToggleOptionFlagLocal formatoptions a<CR> " \b toggles copy-pasteable linebreak settings -nmap <Bslash>b <Plug>CopyLinebreakToggle +nmap <Bslash>b <Plug>(CopyLinebreakToggle) " \c toggles 'cursorline' nnoremap <Bslash>c :<C-U>setlocal cursorline! cursorline?<CR> " \C toggles 'cursorcolumn' @@ -256,9 +251,9 @@ nnoremap <Bslash>n :<C-U>setlocal number! number?<CR> " \N toggles 'ruler' nnoremap <Bslash>N :<C-U>set ruler! ruler?<CR> " \o opens a line below in paste mode -nmap <Bslash>o <Plug>PasteOpenBelow +nmap <Bslash>o <Plug>(PasteOpenBelow) " \o opens a line above in paste mode -nmap <Bslash>O <Plug>PasteOpenAbove +nmap <Bslash>O <Plug>(PasteOpenAbove) " \p toggles paste mode nnoremap <Bslash>p :<C-U>set paste! paste?<CR> " \q formats the current paragraph @@ -282,7 +277,7 @@ nnoremap <Bslash>V :<C-U>let b: t: w:<CR> " \w toggles wrapping nnoremap <Bslash>w :<C-U>setlocal wrap! wrap?<CR> " \x strips trailing whitespace via a custom plugin -nmap <Bslash>x <Plug>StripTrailingWhitespace +nmap <Bslash>x <Plug>(StripTrailingWhitespace) " \y shows all registers nnoremap <Bslash>y :<C-U>registers<CR> " \z sets NZ English spelling (compare \u) |