diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-01-01 23:25:03 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-01-09 20:23:41 -0500 |
| commit | 282109c51b557bbd5d4fafb3f543613748831040 (patch) | |
| tree | 7c0e68c417771ccee697ba537321ff8848c5e65c /runtime/ftplugin | |
| parent | 60e306368d5b6261acdcd88128461259663d8418 (diff) | |
| download | rneovim-282109c51b557bbd5d4fafb3f543613748831040.tar.gz rneovim-282109c51b557bbd5d4fafb3f543613748831040.tar.bz2 rneovim-282109c51b557bbd5d4fafb3f543613748831040.zip | |
vim-patch:82af871
Updated runtime files.
https://github.com/vim/vim/commit/82af8710bf8d1caeeceafb1370a052cb7d92f076
Diffstat (limited to 'runtime/ftplugin')
| -rw-r--r-- | runtime/ftplugin/spec.vim | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/runtime/ftplugin/spec.vim b/runtime/ftplugin/spec.vim index 6d5bf4b806..2a961f8244 100644 --- a/runtime/ftplugin/spec.vim +++ b/runtime/ftplugin/spec.vim @@ -36,10 +36,11 @@ except ImportError: else: specfile = vim.current.buffer.name if specfile: + rpm.delMacro("dist") spec = rpm.spec(specfile) - headers = spec.packages[0].header - version = headers['Version'] - release = ".".join(headers['Release'].split(".")[:-1]) + headers = spec.sourceHeader + version = headers["Version"] + release = headers["Release"] vim.command("let ver = " + version) vim.command("let rel = " + release) PYEND @@ -113,7 +114,10 @@ if !exists("*s:SpecChangelog") endif endif if (chgline != -1) + let tmptime = v:lc_time + language time C let parsed_format = "* ".strftime(format)." - ".ver."-".rel + execute "language time" tmptime let release_info = "+ ".name."-".ver."-".rel let wrong_format = 0 let wrong_release = 0 @@ -179,12 +183,8 @@ if !exists("*s:ParseRpmVars") endif let varname = strpart(a:str, start+2, end-(start+2)) execute a:strline - let definestr = "^[ \t]*%define[ \t]\\+" . varname . "[ \t]\\+\\(.*\\)$" + let definestr = "^[ \t]*%(?:global|define)[ \t]\\+" . varname . "[ \t]\\+\\(.*\\)$" let linenum = search(definestr, "bW") - if (linenum == 0) - let definestr = substitute(definestr, "%define", "%global", "") - let linenum = search(definestr, "bW") - endif if (linenum != -1) let ret = ret . substitute(getline(linenum), definestr, "\\1", "") else @@ -201,7 +201,7 @@ endif let b:match_ignorecase = 0 let b:match_words = - \ '^Name:^%description:^%clean:^%setup:^%build:^%install:^%files:' . + \ '^Name:^%description:^%clean:^%(?:auto)?setup:^%build:^%install:^%files:' . \ '^%package:^%preun:^%postun:^%changelog' let &cpo = s:cpo_save |