Attachment 855701 Details for Bug 1058041 – Patch

[patch] Patch

global_macros.patch (text/plain), 3.13 KB, created by Igor Gnatenko on 2014-01-26 17:27:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Gnatenko

Created: 2014-01-26 17:27:05 UTC

Size: 3.13 KB

patch

obsolete

># HG changeset patch
># User Igor Gnatenko <i.gnatenko.brain@gmail.com>
># Date 1390756213 -14400
>#      Sun Jan 26 21:10:13 2014 +0400
># Node ID 0e5b0ebd912222e7b4d8440c264b652b986950ce
># Parent  c9cad40b418113f62ce3481f66351137b90910ef
>spec: add '%global' macros support
>
>diff -r c9cad40b4181 -r 0e5b0ebd9122 runtime/ftplugin/spec.vim
>--- a/runtime/ftplugin/spec.vim	Fri Jan 24 19:55:37 2014 +0100
>+++ b/runtime/ftplugin/spec.vim	Sun Jan 26 21:10:13 2014 +0400
>@@ -150,6 +150,10 @@
> 		execute a:strline
> 		let definestr = "^[ \t]*%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
>diff -r c9cad40b4181 -r 0e5b0ebd9122 runtime/syntax/spec.vim
>--- a/runtime/syntax/spec.vim	Fri Jan 24 19:55:37 2014 +0100
>+++ b/runtime/syntax/spec.vim	Sun Jan 26 21:10:13 2014 +0400
>@@ -82,7 +82,7 @@
> 
> "One line macros - valid in all ScriptAreas
> "tip: remember do include new items on specScriptArea's skip section
>-syn region specSectionMacroArea oneline matchgroup=specSectionMacro start='^%$define\|patch\d*\|setup\|configure\|GNUconfigure\|find_lang\|makeinstall\|include$\>' end='$' contains=specCommandOpts,specMacroIdentifier
>+syn region specSectionMacroArea oneline matchgroup=specSectionMacro start='^%$define\|global\|patch\d*\|setup\|configure\|GNUconfigure\|find_lang\|makeinstall\|include$\>' end='$' contains=specCommandOpts,specMacroIdentifier
> syn region specSectionMacroBracketArea oneline matchgroup=specSectionMacro start='^%{$configure\|GNUconfigure\|find_lang\|makeinstall$}' end='$' contains=specCommandOpts,specMacroIdentifier
> 
> "%% Files Section %%
>@@ -113,7 +113,7 @@
> syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
> 
> "%% Scripts Section %%
>-syn region specScriptArea matchgroup=specSection start='^%$prep\|build\|install\|clean\|pre\|postun\|preun\|post$\>' skip='^%{\|^%$define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall$\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
>+syn region specScriptArea matchgroup=specSection start='^%$prep\|build\|install\|clean\|pre\|postun\|preun\|post$\>' skip='^%{\|^%$define\|global\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall$\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
> 
> "%% Changelog Section %%
> syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense

Actions: View | Diff

Attachments on bug 1058041: 855701