diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-07 10:49:16 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-07 10:49:16 +1200 |
commit | 1063945e571d5108c288766876a4d520b63ddb25 (patch) | |
tree | 9baad31ab4e52566be953059b0b51c2ed34f11f3 | |
parent | Merge branch 'release/v5.21.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-1063945e571d5108c288766876a4d520b63ddb25.tar.gz dotfiles-1063945e571d5108c288766876a4d520b63ddb25.zip |
Merge branch 'release/v5.22.0'v5.22.0
* release/v5.22.0:
Remove accidentally committed files
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | vim/autoload/.vimrc.vim.un~ | bin | 96333 -> 0 bytes | |||
-rw-r--r-- | vim/autoload/vimrc.vim~ | 54 |
3 files changed, 2 insertions, 56 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v5.21.0 -Thu Jun 6 22:13:24 UTC 2019 +tejr dotfiles v5.22.0 +Thu Jun 6 22:49:16 UTC 2019 diff --git a/vim/autoload/.vimrc.vim.un~ b/vim/autoload/.vimrc.vim.un~ Binary files differdeleted file mode 100644 index 9ad13933..00000000 --- a/vim/autoload/.vimrc.vim.un~ +++ /dev/null diff --git a/vim/autoload/vimrc.vim~ b/vim/autoload/vimrc.vim~ deleted file mode 100644 index 90ff13f1..00000000 --- a/vim/autoload/vimrc.vim~ +++ /dev/null @@ -1,54 +0,0 @@ -" Escape a text value for :execute-based :set inclusion in an option -function! vimrc#EscapeSet(string) abort - return escape(a:string, '\ |"') -endfunction - -" Escape a text value for inclusion as an element in a comma-separated list -" option. Yes, the comma being the sole inner escaped character here is -" correct. No, we shouldn't escape backslash itself. Yes, that means it's -" impossible to have the literal string '\,' in a part. -function! vimrc#EscapeSetPart(string) abort - return vimrc#EscapeSet(escape(a:string, ',')) -endfunction - -" Check that we have a plugin available, and will be loading it -function! vimrc#PluginReady(filename) abort - return globpath(&runtimepath, 'plugin/'.a:filename.'.vim') !=# '' - \ && &loadplugins -endfunction - -" Split a comma-separated option string into its constituent parts, imitating -" copy_option_part() in the Vim sources. This isn't perfect, but it should be -" more than good enough. A separator can be defined as: a comma that is not -" preceded by a backslash, and which is followed by any number of spaces -" and/or further commas. -function! vimrc#SplitOption(str) abort - return split(a:str, '\\\@<!,[, ]*') -endfunction - -" Convenience version function check that should work with 7.0 or newer; -" takes strings like 7.3.251 -function! vimrc#Version(verstr) abort - - " Throw toys if the string doesn't match the expected format - if a:verstr !~# '^\d\+\.\d\+.\d\+$' - echoerr 'Invalid version string: '.a:verstr - endif - - " Split version string into major, minor, and patch level integers - let [major, minor, patch] = split(a:verstr, '\.') - - " Create a string like 801 from a version number 8.1 to compare it to - " the v:version integer - let ver = major * 100 + minor - - " Compare versions - if v:version > ver - return 1 " Current Vim is newer than the wanted one - elseif ver < v:version - return 0 " Current Vim is older than the wanted one - else - return has('patch'.patch) " Versions equal, return patch presence - endif - -endfunction |