ftplugin: simplify case with %global/%define

Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
ignatenkobrain · Apr 15, 2016 · 642a0e2 · 642a0e2
1 parent e7480c4
commit 642a0e2
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/ftplugin/spec.vim b/ftplugin/spec.vim
@@ -182,12 +182,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