Merge branch 'release/v7.20.0'v7.20.0

* release/v7.20.0:
  Restore 'foldlevel' to 99 for C filetype
  Completely rewrite an awkward comment block

3 files changed, 18 insertions, 16 deletions

diff --git a/VERSION b/VERSION
index 2a5c1c72..78da6cce 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v7.19.0
-Sat, 23 Nov 2019 01:37:27 +0000
+tejr dotfiles v7.20.0
+Wed, 27 Nov 2019 20:46:01 +0000
diff --git a/vim/after/ftplugin/c.vim b/vim/after/ftplugin/c.vim
index bc531a61..f082ca18 100644
--- a/vim/after/ftplugin/c.vim
+++ b/vim/after/ftplugin/c.vim
@@ -6,9 +6,9 @@ let b:undo_ftplugin .= '|setlocal commentstring< define< include<'
 setlocal complete+=d
 let b:undo_ftplugin .= '|setlocal complete<'
 
-" Fold based on indent level, and start with all folds closed
+" Fold based on indent level, but start with all folds open
 setlocal foldmethod=indent
-setlocal foldlevel=0
+setlocal foldlevel=99
 let b:undo_ftplugin .= '|setlocal foldmethod< foldlevel<'
 
 " Include system headers on UNIX
diff --git a/vim/vimrc b/vim/vimrc
index b4f5243a..9e24e8bd 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -854,18 +854,20 @@ set wildignore=*~,#*#,*.7z,.DS_Store,.git,.hg,.svn,*.a,*.adf,*.asc,*.au,*.aup
       \,*.s3m,*.sdbm,*.sqlite,*.swf,*.swp,*.tar,*.tga,*.ttf,*.wav,*.webm,*.xbm
       \,*.xcf,*.xls,*.xlsx,*.xpm,*.xz,*.zip
 
-" Allow me to be lazy and type a path to complete on the Ex command line in
-" all-lowercase, and transform the consequent completion to match the
-" appropriate case, like the Readline setting completion-ignore-case can be
-" used for GNU Bash.
-"
-" As far as I can tell, despite its name, the 'wildignore' case option doesn’t
-" have anything to do with the 'wildignore' option, and so files that would
-" match any of those patterns only with case insensitivity implied will still
-" be candidates for completion.
-"
-" The option wasn’t added until v7.3.72, so we need to check it exists before
-" we try to set it.
+" Allow me to type a path to complete on the Ex command line in all-lowercase,
+" and transform the consequent completion to match the appropriate case, like
+" the Readline setting ‘completion-ignore-case’ can be used for GNU Bash.
+"
+" When completing filenames on the command line, choose completions without
+" regard to case, allowing me the ease of typing a partial path in
+" all-lowercase.  This is very similar to the Readline setting
+" ‘completion-ignore-case’ used for Bash.
+"
+" The 'wildignorecase' option is not related to the similarly-named
+" 'wildignore' option, nor to the +wildmenu feature.
+"
+" We need to check that the 'wildignorecase' option exists before we set it,
+" because it wasn't added to Vim until v7.3.72:
 "
 " <https://github.com/vim/vim/releases/tag/v7.3.072>
 "