From 67cd7a2a044d10a194bd157a674e63cb36ba6a32 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 12 Jul 2018 11:14:53 +1200 Subject: Upgrade cmdwin_ctrlc.vim plugin --- vim/bundle/cmdwin_ctrlc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/cmdwin_ctrlc b/vim/bundle/cmdwin_ctrlc index fa1a4e8c..9598ef4c 160000 --- a/vim/bundle/cmdwin_ctrlc +++ b/vim/bundle/cmdwin_ctrlc @@ -1 +1 @@ -Subproject commit fa1a4e8c17eebab4b9f9d05ec6ed19a45af6669f +Subproject commit 9598ef4ce49d9d0a6daf63cf83abaa0c627aaace -- cgit v1.2.3 From 9c8ab3c31591ac46ce2ced1a699d86080f0676c0 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 12 Jul 2018 11:16:44 +1200 Subject: Remove fixed_join.vim plugin From discussion with nickspoon; let's try out using the jump-to-join default behaviour for a little while, and use gq motions instead for formatting prose. --- .gitmodules | 3 --- vim/bundle/fixed_join | 1 - vim/vimrc | 5 ----- 3 files changed, 9 deletions(-) delete mode 160000 vim/bundle/fixed_join 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 diff --git a/vim/bundle/fixed_join b/vim/bundle/fixed_join deleted file mode 160000 index e24d47cb..00000000 --- a/vim/bundle/fixed_join +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e24d47cba9efa6289867e04a12241767b880cd12 diff --git a/vim/vimrc b/vim/vimrc index d1b47b0b..1dc90aa0 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -178,11 +178,6 @@ vnoremap :nohlsearchgv inoremap InsertCancel u imap InsertCancel -" Remap normal J to stay in place while joining lines -" Default to not-quite-correct vim-tiny-compatible map if no plugin -nnoremap FixedJoin mzJ`z -nmap J FixedJoin - " Remap normal/visual space to scroll down a page, backspace up nnoremap nnoremap -- cgit v1.2.3 From 2e37b2745be68b1524298c7a302fbd1c1cf5672a Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 12 Jul 2018 11:35:44 +1200 Subject: Update Vim plugins --- vim/bundle/cmdwin_ctrlc | 2 +- vim/bundle/insert_suspend_hlsearch | 2 +- vim/bundle/insert_timeout | 2 +- vim/bundle/paste_open | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vim/bundle/cmdwin_ctrlc b/vim/bundle/cmdwin_ctrlc index 9598ef4c..e3b155d0 160000 --- a/vim/bundle/cmdwin_ctrlc +++ b/vim/bundle/cmdwin_ctrlc @@ -1 +1 @@ -Subproject commit 9598ef4ce49d9d0a6daf63cf83abaa0c627aaace +Subproject commit e3b155d0a2281a96f479a4f665fd4ee5bf59dab8 diff --git a/vim/bundle/insert_suspend_hlsearch b/vim/bundle/insert_suspend_hlsearch index 0b7cb75d..e5f9e3a8 160000 --- a/vim/bundle/insert_suspend_hlsearch +++ b/vim/bundle/insert_suspend_hlsearch @@ -1 +1 @@ -Subproject commit 0b7cb75d1bd8eac9e411ee344f78608122e69d6f +Subproject commit e5f9e3a8985ee0e038324ce493b7b6833e92b9f5 diff --git a/vim/bundle/insert_timeout b/vim/bundle/insert_timeout index c50cc11e..6cbacba5 160000 --- a/vim/bundle/insert_timeout +++ b/vim/bundle/insert_timeout @@ -1 +1 @@ -Subproject commit c50cc11e48b33187b398f1e9c7f1b1125c7e1d62 +Subproject commit 6cbacba5d66826497b3a136fb8d692921b475665 diff --git a/vim/bundle/paste_open b/vim/bundle/paste_open index 8537d312..6729535c 160000 --- a/vim/bundle/paste_open +++ b/vim/bundle/paste_open @@ -1 +1 @@ -Subproject commit 8537d312627d4acff204c543927549dcbfeae8fc +Subproject commit 6729535cc2681a3f6016ef0a7ec7d9f83a9d30b8 -- cgit v1.2.3 From 42609de44fde87fd2f27fa997c779c4fbe6208cf Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 12 Jul 2018 12:56:40 +1200 Subject: Update and reconfigure for insert_cancel.vim --- vim/bundle/insert_cancel | 2 +- vim/vimrc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/bundle/insert_cancel b/vim/bundle/insert_cancel index ab987c93..bdf4c1ad 160000 --- a/vim/bundle/insert_cancel +++ b/vim/bundle/insert_cancel @@ -1 +1 @@ -Subproject commit ab987c9355fc4595861c194ede44a6607174464d +Subproject commit bdf4c1ad5878e4bc4c7066ded1f62f2f2c38ffc9 diff --git a/vim/vimrc b/vim/vimrc index 1dc90aa0..7393c302 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -175,8 +175,8 @@ vnoremap :nohlsearchgv " Remap insert Ctrl-C to undo the escaped insert operation " Default to not-quite-correct vim-tiny-compatible map if no plugin -inoremap InsertCancel u -imap InsertCancel +inoremap (InsertCancel) u +imap (InsertCancel) " Remap normal/visual space to scroll down a page, backspace up nnoremap -- cgit v1.2.3 From 0f47beb14eaecdd0186f48549da5f03b2ab8ed45 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 12 Jul 2018 13:01:40 +1200 Subject: Update and reconfigure for copy_linebreak.vim --- vim/bundle/copy_linebreak | 2 +- vim/vimrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/bundle/copy_linebreak b/vim/bundle/copy_linebreak index f6fdbf1a..4d189176 160000 --- a/vim/bundle/copy_linebreak +++ b/vim/bundle/copy_linebreak @@ -1 +1 @@ -Subproject commit f6fdbf1afaae48b16a11744ba3f9ea1d3922ebb3 +Subproject commit 4d189176359f23318cb46386d4140cd7fc629124 diff --git a/vim/vimrc b/vim/vimrc index 7393c302..a25e5e90 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -217,7 +217,7 @@ nmap ] PutBlankLinesBelow " \a toggles 'formatoptions' 'a' flag using a plugin nnoremap a :ToggleOptionFlagLocal formatoptions a " \b toggles copy-pasteable linebreak settings -nmap b CopyLinebreakToggle +nmap b (CopyLinebreakToggle) " \c toggles 'cursorline' nnoremap c :setlocal cursorline! cursorline? " \C toggles 'cursorcolumn' -- cgit v1.2.3 From c3caf7a59c033ae38e7c31db4e66ce77fc9c2485 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 12 Jul 2018 13:06:16 +1200 Subject: Update and configure for strip_trailing_whitespace --- vim/bundle/strip_trailing_whitespace | 2 +- vim/vimrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/bundle/strip_trailing_whitespace b/vim/bundle/strip_trailing_whitespace index 1878ccd2..e689a609 160000 --- a/vim/bundle/strip_trailing_whitespace +++ b/vim/bundle/strip_trailing_whitespace @@ -1 +1 @@ -Subproject commit 1878ccd255b91ffabbe754d8b843e795fa95e034 +Subproject commit e689a60912a1832f167bdc88cf08cbba2a9ae7e1 diff --git a/vim/vimrc b/vim/vimrc index a25e5e90..766c0f16 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -277,7 +277,7 @@ nnoremap V :let b: t: w: " \w toggles wrapping nnoremap w :setlocal wrap! wrap? " \x strips trailing whitespace via a custom plugin -nmap x StripTrailingWhitespace +nmap x (StripTrailingWhitespace) " \y shows all registers nnoremap y :registers " \z sets NZ English spelling (compare \u) -- cgit v1.2.3 From e64c99cc25bc40f71529b6bea893814b465928e3 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 12 Jul 2018 13:09:47 +1200 Subject: Upgrade and configure for paste_open.vim --- vim/bundle/paste_open | 2 +- vim/vimrc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/bundle/paste_open b/vim/bundle/paste_open index 6729535c..dfedd438 160000 --- a/vim/bundle/paste_open +++ b/vim/bundle/paste_open @@ -1 +1 @@ -Subproject commit 6729535cc2681a3f6016ef0a7ec7d9f83a9d30b8 +Subproject commit dfedd43831f23f0288ada964bf74dba2d36bca7b diff --git a/vim/vimrc b/vim/vimrc index 766c0f16..aaf1f654 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -251,9 +251,9 @@ nnoremap n :setlocal number! number? " \N toggles 'ruler' nnoremap N :set ruler! ruler? " \o opens a line below in paste mode -nmap o PasteOpenBelow +nmap o (PasteOpenBelow) " \o opens a line above in paste mode -nmap O PasteOpenAbove +nmap O (PasteOpenAbove) " \p toggles paste mode nnoremap p :set paste! paste? " \q formats the current paragraph -- cgit v1.2.3 From 2eef852789feece0d0116670157bbbcd1bc83cb1 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 12 Jul 2018 13:13:43 +1200 Subject: Update and configure for put_blank_lines.vim --- vim/bundle/put_blank_lines | 2 +- vim/vimrc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/bundle/put_blank_lines b/vim/bundle/put_blank_lines index f2d595cf..0f631936 160000 --- a/vim/bundle/put_blank_lines +++ b/vim/bundle/put_blank_lines @@ -1 +1 @@ -Subproject commit f2d595cf0f10eae715536397e226eb3241706af7 +Subproject commit 0f63193638bebf632fd3cc49262863a062586971 diff --git a/vim/vimrc b/vim/vimrc index aaf1f654..53c524ea 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -209,8 +209,8 @@ nnoremap [t :tabprevious nnoremap ]t :tabnext " Insert blank lines around current line -nmap [ PutBlankLinesAbove -nmap ] PutBlankLinesBelow +nmap [ (PutBlankLinesAbove) +nmap ] (PutBlankLinesBelow) " Normal leader maps; use not for vim-tiny -- cgit v1.2.3 From ab3f06b5ac7de09ddddafd7c68eb7c45d05287ad Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 12 Jul 2018 13:20:25 +1200 Subject: Update and configure for make_target.vim --- vim/after/ftplugin/make.vim | 2 +- vim/bundle/make_target | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 m MakeTarget +nmap m (MakeTarget) let b:undo_ftplugin .= '|nunmap m' diff --git a/vim/bundle/make_target b/vim/bundle/make_target index 1327bf1a..1f374d58 160000 --- a/vim/bundle/make_target +++ b/vim/bundle/make_target @@ -1 +1 @@ -Subproject commit 1327bf1a430b77aa38a69e4de33d92cf844f0bad +Subproject commit 1f374d588b8ecbe7c5f02077db6b7d919a646ea1 -- cgit v1.2.3 From 7d6aa7dc02f68b85b75df6083126bbef8c8931a8 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 12 Jul 2018 13:24:23 +1200 Subject: Update and configure for perl_version_bump.vim --- vim/after/ftplugin/perl.vim | 4 ++-- vim/bundle/perl_version_bump | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 c' " Bump version numbers nmap v - \ PerlVersionBumpMinor + \ (PerlVersionBumpMinor) nmap V - \ PerlVersionBumpMajor + \ (PerlVersionBumpMajor) let b:undo_ftplugin .= '|nunmap v' \ . '|nunmap V' diff --git a/vim/bundle/perl_version_bump b/vim/bundle/perl_version_bump index 3ea1890e..dad32827 160000 --- a/vim/bundle/perl_version_bump +++ b/vim/bundle/perl_version_bump @@ -1 +1 @@ -Subproject commit 3ea1890e49b064cb7e8fc1481fc70d5a4c919cca +Subproject commit dad3282770c101b6c0aee1af0e4f8cf0f8cb4c02 -- cgit v1.2.3 From 38c91a0563ead5fcf4bf74ce91627cec7686abc1 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 12 Jul 2018 13:39:36 +1200 Subject: Include hotfixes for plugin map renames --- vim/bundle/insert_cancel | 2 +- vim/bundle/make_target | 2 +- vim/bundle/paste_open | 2 +- vim/bundle/put_blank_lines | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vim/bundle/insert_cancel b/vim/bundle/insert_cancel index bdf4c1ad..a2308ef3 160000 --- a/vim/bundle/insert_cancel +++ b/vim/bundle/insert_cancel @@ -1 +1 @@ -Subproject commit bdf4c1ad5878e4bc4c7066ded1f62f2f2c38ffc9 +Subproject commit a2308ef31dcfad2bc01cac0b9d98571230a1b107 diff --git a/vim/bundle/make_target b/vim/bundle/make_target index 1f374d58..f4fe9405 160000 --- a/vim/bundle/make_target +++ b/vim/bundle/make_target @@ -1 +1 @@ -Subproject commit 1f374d588b8ecbe7c5f02077db6b7d919a646ea1 +Subproject commit f4fe940526c9351990c9966eb6828f315c833117 diff --git a/vim/bundle/paste_open b/vim/bundle/paste_open index dfedd438..bd361314 160000 --- a/vim/bundle/paste_open +++ b/vim/bundle/paste_open @@ -1 +1 @@ -Subproject commit dfedd43831f23f0288ada964bf74dba2d36bca7b +Subproject commit bd3613145539911313ed8c1f7524b571fe892333 diff --git a/vim/bundle/put_blank_lines b/vim/bundle/put_blank_lines index 0f631936..a94f0e3c 160000 --- a/vim/bundle/put_blank_lines +++ b/vim/bundle/put_blank_lines @@ -1 +1 @@ -Subproject commit 0f63193638bebf632fd3cc49262863a062586971 +Subproject commit a94f0e3ceef7719d1f3baf2f381b6f8f009c646e -- cgit v1.2.3 From 7f6609a6efc758b85c193f01187cb714c054bebe Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 12 Jul 2018 13:40:34 +1200 Subject: Bump VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7c1567b9..530f7920 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v1.26.0 +tejr dotfiles v1.27.0 Wed Jul 11 13:19:53 UTC 2018 -- cgit v1.2.3