Merge branch 'release/v4.25.0'v4.25.0

* release/v4.25.0:
  Bump VERSION
  Update vim-strip-trailing-whitespace to v2.1.1
  Update vim-perl-version-bump to v1.1.1
  Update vim-strip-trailing-whitespace to v2.1.0
  Update vim-squeeze-repeat-blanks to v0.2.0
  Update vim-shebang-create-exec to v0.2.0
  Update vim-scroll-next to v0.2.0
  Break a long condition
  Don't feature-test for 'printoptions' on Debian
  Don't feature-test for 'ruler' setting on Debian
  Update vim-sahara to v1.0.0
  Update vim-redact-pass to v1.3.0
  Update vim-quickfix-auto-open to v0.3.0
  Update vim-perl-version-bump to v1.1.0
  Update vim-paste-open to v1.1.0
  Update vim-make-target to v1.3.0
  Adjust 'commentstring' and 'include' C Vim setting

15 files changed, 14 insertions, 19 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
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<'
diff --git a/vim/bundle/make_target b/vim/bundle/make_target
-Subproject 71a5fa558b28e081bede012f075233924b0aee7
+Subproject 384115dabd0d3233dbd63c73f43fa84a6f80a8c
diff --git a/vim/bundle/paste_open b/vim/bundle/paste_open
-Subproject bd3613145539911313ed8c1f7524b571fe89233
+Subproject e26c80bac5ab5592ddd4d2186180a85e58d8ba8
diff --git a/vim/bundle/perl_version_bump b/vim/bundle/perl_version_bump
-Subproject dad3282770c101b6c0aee1af0e4f8cf0f8cb4c0
+Subproject e28fe8b762612978f1096b82f5387af7e13cd16
diff --git a/vim/bundle/quickfix_auto_open b/vim/bundle/quickfix_auto_open
-Subproject 2347ea43e5078932663fe46e6ff9e35de54765a
+Subproject bc88f5e2c911ad9148bd76a3c78f43e8a878bd7
diff --git a/vim/bundle/redact_pass b/vim/bundle/redact_pass
-Subproject ee516369f3ce613ad3160afa96fe0bfa8dd1aed
+Subproject f3c2ffa6ba2bf9949d5de8d37b4426c22885ad9
diff --git a/vim/bundle/sahara b/vim/bundle/sahara
-Subproject 485c5477f5cb83c07b0ccc1c198d0a7810c70aa
+Subproject 8323dbdf27870a0845987cfacb49950b23dbbee
diff --git a/vim/bundle/scroll_next b/vim/bundle/scroll_next
-Subproject 56166b68079f1573de93c4f134996854b4e6e75
+Subproject d1c87018e705e976b1e500ab32fcfe1a0344557
diff --git a/vim/bundle/shebang_create_exec b/vim/bundle/shebang_create_exec
-Subproject 9adbf4f7e575fe8bbcfb2e1b2b6cd34bf42140a
+Subproject 1d9d72c1bce46d7b88ea1b765d890e56dc91384
diff --git a/vim/bundle/squeeze_repeat_blanks b/vim/bundle/squeeze_repeat_blanks
-Subproject e0e624a9b467c9b99de5bd76c9eda73c0701464
+Subproject 6cd99a9510897e87fba76721b3c9d148c51a164
diff --git a/vim/bundle/strip_trailing_whitespace b/vim/bundle/strip_trailing_whitespace
-Subproject 77148fa855e7b1095e70819d03517ede42e68fc
+Subproject 28a22be4942c8af5fec969b2f4cf2edae331fe4
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 1db56f74..07649f07 100644
--- a/vim/system/debian.vim
+++ b/vim/system/debian.vim
@@ -1,17 +1,14 @@
 " 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
 
 " Set options back to appropriate defaults
 set history&
+set printoptions&
+set ruler&
 set suffixes&
-if has('cmdline_info')
-  set ruler&
-endif
-if has('printoptions')
-  set printoptions&
-endif
 
 " Restore terminal settings to reflect terminfo
 set t_Co& t_Sf& t_Sb&
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')