From 6128487b9c240052889d27e61411fa1f4dcbde8c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 11 May 2019 11:42:16 +1200 Subject: Adjust 'commentstring' and 'include' C Vim setting --- vim/after/ftplugin/c.vim | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/vim/after/ftplugin/c.vim b/vim/after/ftplugin/c.vim index e3eeaede..b5989410 100644 --- a/vim/after/ftplugin/c.vim +++ b/vim/after/ftplugin/c.vim @@ -1,13 +1,14 @@ +" Set 'commentstring' and 'include' back to their default C-friendly values +setlocal commentstring&vim +setlocal include&vim + " Include macros in completion setlocal complete+=d -" Set include pattern -setlocal include=^\\s*#\\s*include - " Include system headers on UNIX if has('unix') setlocal path+=/usr/include endif " Undo all of the above -let b:undo_ftplugin .= '|setlocal complete< include< path<' +let b:undo_ftplugin .= '|setlocal commentstring< complete< include< path<' -- cgit v1.2.3 From 67171ba862e30cbab91661a9bf5b922dd35c81f2 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 16:12:53 +1200 Subject: Update vim-make-target to v1.3.0 --- vim/bundle/make_target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/make_target b/vim/bundle/make_target index 71a5fa55..384115da 160000 --- a/vim/bundle/make_target +++ b/vim/bundle/make_target @@ -1 +1 @@ -Subproject commit 71a5fa558b28e081bede012f075233924b0aee75 +Subproject commit 384115dabd0d3233dbd63c73f43fa84a6f80a8c6 -- cgit v1.2.3 From 3514f0d50d5d46ddeb9367dc505bd6440c2183eb Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 16:17:14 +1200 Subject: Update vim-paste-open to v1.1.0 --- vim/bundle/paste_open | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/paste_open b/vim/bundle/paste_open index bd361314..e26c80ba 160000 --- a/vim/bundle/paste_open +++ b/vim/bundle/paste_open @@ -1 +1 @@ -Subproject commit bd3613145539911313ed8c1f7524b571fe892333 +Subproject commit e26c80bac5ab5592ddd4d2186180a85e58d8ba8d -- cgit v1.2.3 From 17b0271fd03b3e3988c758d202591b16b6988efd Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 16:23:46 +1200 Subject: Update vim-perl-version-bump to v1.1.0 --- vim/bundle/perl_version_bump | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/perl_version_bump b/vim/bundle/perl_version_bump index dad32827..39d0f049 160000 --- a/vim/bundle/perl_version_bump +++ b/vim/bundle/perl_version_bump @@ -1 +1 @@ -Subproject commit dad3282770c101b6c0aee1af0e4f8cf0f8cb4c02 +Subproject commit 39d0f04926925af1df215c1c149ebd6ca8308acb -- cgit v1.2.3 From 14e9f6beb602dd4381a0ff301a0aaabcaa940b27 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 16:41:21 +1200 Subject: Update vim-quickfix-auto-open to v0.3.0 --- vim/bundle/quickfix_auto_open | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/quickfix_auto_open b/vim/bundle/quickfix_auto_open index 2347ea43..bc88f5e2 160000 --- a/vim/bundle/quickfix_auto_open +++ b/vim/bundle/quickfix_auto_open @@ -1 +1 @@ -Subproject commit 2347ea43e5078932663fe46e6ff9e35de54765a2 +Subproject commit bc88f5e2c911ad9148bd76a3c78f43e8a878bd76 -- cgit v1.2.3 From 624e77efa9fb3ca1ce09512da71058ab2990e129 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 17:01:00 +1200 Subject: Update vim-redact-pass to v1.3.0 --- vim/bundle/redact_pass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/redact_pass b/vim/bundle/redact_pass index ee516369..f3c2ffa6 160000 --- a/vim/bundle/redact_pass +++ b/vim/bundle/redact_pass @@ -1 +1 @@ -Subproject commit ee516369f3ce613ad3160afa96fe0bfa8dd1aedc +Subproject commit f3c2ffa6ba2bf9949d5de8d37b4426c22885ad91 -- cgit v1.2.3 From b89f6e84982c7a964994b4aa12295dfe5013cbe7 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 22:09:26 +1200 Subject: Update vim-sahara to v1.0.0 This offloads the color depth check to the colorscheme, and avoids repeating it. --- vim/bundle/sahara | 2 +- vim/vimrc | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/vim/bundle/sahara b/vim/bundle/sahara index 485c5477..8323dbdf 160000 --- a/vim/bundle/sahara +++ b/vim/bundle/sahara @@ -1 +1 @@ -Subproject commit 485c5477f5cb83c07b0ccc1c198d0a7810c70aa2 +Subproject commit 8323dbdf27870a0845987cfacb49950b23dbbee4 diff --git a/vim/vimrc b/vim/vimrc index 17282ce1..48ebca1d 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -31,11 +31,7 @@ if has('syntax') try " Use sahara.vim colorscheme, if using gVim or a 256-color term - if has('gui_running') || &t_Co >= 256 - colorscheme sahara - else - throw 'Not loading sahara on this terminal' - endif + colorscheme sahara " Use the colorscheme's subtle 'cursorline', if it loaded if exists('+cursorline') -- cgit v1.2.3 From 264daaafd51c67dda484d9f880b48f96f47f05dd Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 23:02:56 +1200 Subject: Don't feature-test for 'ruler' setting on Debian --- vim/system/debian.vim | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vim/system/debian.vim b/vim/system/debian.vim index 1db56f74..0a2c56e1 100644 --- a/vim/system/debian.vim +++ b/vim/system/debian.vim @@ -5,10 +5,8 @@ endif " Set options back to appropriate defaults set history& +set ruler& set suffixes& -if has('cmdline_info') - set ruler& -endif if has('printoptions') set printoptions& endif -- cgit v1.2.3 From 8d6b67d586a9b9f62c181a14b346e706cb264e12 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 23:04:19 +1200 Subject: Don't feature-test for 'printoptions' on Debian --- vim/system/debian.vim | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vim/system/debian.vim b/vim/system/debian.vim index 0a2c56e1..2328ad4f 100644 --- a/vim/system/debian.vim +++ b/vim/system/debian.vim @@ -5,11 +5,9 @@ endif " Set options back to appropriate defaults set history& +set printoptions& set ruler& set suffixes& -if has('printoptions') - set printoptions& -endif " Restore terminal settings to reflect terminfo set t_Co& t_Sf& t_Sb& -- cgit v1.2.3 From 52ea4b6d3cdb0e79649fae5280e72c067f173c61 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 23:04:47 +1200 Subject: Break a long condition --- vim/system/centos.vim | 3 ++- vim/system/debian.vim | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/vim/system/centos.vim b/vim/system/centos.vim index d5ea1036..3c1dbc48 100644 --- a/vim/system/centos.vim +++ b/vim/system/centos.vim @@ -1,5 +1,6 @@ " Revert settings that CentOS might have touched -if $VIM !=# '/usr/share/vim' || !filereadable('/etc/centos-release') +if $VIM !=# '/usr/share/vim' + \ || !filereadable('/etc/centos-release') finish endif diff --git a/vim/system/debian.vim b/vim/system/debian.vim index 2328ad4f..07649f07 100644 --- a/vim/system/debian.vim +++ b/vim/system/debian.vim @@ -1,5 +1,6 @@ " Revert settings that Debian might have touched -if $VIM !=# '/usr/share/vim' || !filereadable('/etc/debian_version') +if $VIM !=# '/usr/share/vim' + \ || !filereadable('/etc/debian_version') finish endif -- cgit v1.2.3 From ea8ee32e6e92f163a50eca472a79dbeeb2a97dba Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 23:23:14 +1200 Subject: Update vim-scroll-next to v0.2.0 --- vim/bundle/scroll_next | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/scroll_next b/vim/bundle/scroll_next index 56166b68..d1c87018 160000 --- a/vim/bundle/scroll_next +++ b/vim/bundle/scroll_next @@ -1 +1 @@ -Subproject commit 56166b68079f1573de93c4f134996854b4e6e75a +Subproject commit d1c87018e705e976b1e500ab32fcfe1a03445577 -- cgit v1.2.3 From d22ee6951cd285146bc1c1874fa0135baf3fa5ca Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 23:29:42 +1200 Subject: Update vim-shebang-create-exec to v0.2.0 --- vim/bundle/shebang_create_exec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/shebang_create_exec b/vim/bundle/shebang_create_exec index 9adbf4f7..1d9d72c1 160000 --- a/vim/bundle/shebang_create_exec +++ b/vim/bundle/shebang_create_exec @@ -1 +1 @@ -Subproject commit 9adbf4f7e575fe8bbcfb2e1b2b6cd34bf42140a2 +Subproject commit 1d9d72c1bce46d7b88ea1b765d890e56dc91384e -- cgit v1.2.3 From 8a9a1c32008f6655ba28f23edb9a7310b37b3169 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 23:33:45 +1200 Subject: Update vim-squeeze-repeat-blanks to v0.2.0 --- vim/bundle/squeeze_repeat_blanks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/squeeze_repeat_blanks b/vim/bundle/squeeze_repeat_blanks index e0e624a9..6cd99a95 160000 --- a/vim/bundle/squeeze_repeat_blanks +++ b/vim/bundle/squeeze_repeat_blanks @@ -1 +1 @@ -Subproject commit e0e624a9b467c9b99de5bd76c9eda73c0701464c +Subproject commit 6cd99a9510897e87fba76721b3c9d148c51a1649 -- cgit v1.2.3 From 95743b058dac4fcbedd78db2ab21e041d8880dae Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 23:37:30 +1200 Subject: Update vim-strip-trailing-whitespace to v2.1.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 77148fa8..f3153704 160000 --- a/vim/bundle/strip_trailing_whitespace +++ b/vim/bundle/strip_trailing_whitespace @@ -1 +1 @@ -Subproject commit 77148fa855e7b1095e70819d03517ede42e68fcb +Subproject commit f31537040a250048bda0308cf78e1e23342a3da3 -- cgit v1.2.3 From 2ed70f75d37272a48a39e9903c976f4200806e05 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 23:45:18 +1200 Subject: Update vim-perl-version-bump to v1.1.1 --- vim/bundle/perl_version_bump | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/perl_version_bump b/vim/bundle/perl_version_bump index 39d0f049..e28fe8b7 160000 --- a/vim/bundle/perl_version_bump +++ b/vim/bundle/perl_version_bump @@ -1 +1 @@ -Subproject commit 39d0f04926925af1df215c1c149ebd6ca8308acb +Subproject commit e28fe8b762612978f1096b82f5387af7e13cd16d -- cgit v1.2.3 From f895ac3fb510036435b5952b3ebfb368b39312e1 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 23:51:33 +1200 Subject: Update vim-strip-trailing-whitespace to v2.1.1 --- 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 f3153704..28a22be4 160000 --- a/vim/bundle/strip_trailing_whitespace +++ b/vim/bundle/strip_trailing_whitespace @@ -1 +1 @@ -Subproject commit f31537040a250048bda0308cf78e1e23342a3da3 +Subproject commit 28a22be4942c8af5fec969b2f4cf2edae331fe44 -- cgit v1.2.3 From 3ccc0746dcd6b8fbe71136011e8a5aac55e89421 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 May 2019 23:51:48 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index a8c12061..02b1b623 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v4.24.0 -Fri May 10 23:35:38 UTC 2019 +tejr dotfiles v4.25.0 +Sun May 12 11:51:48 UTC 2019 -- cgit v1.2.3