From 24ef77704c0ed6262ff6e20cc0e1bd45c9b6e046 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Sat, 24 Sep 2016 11:09:42 +0300 Subject: [PATCH 1/4] Add more standard GNU keywords to the makefile completion keywords --- rc/base/makefile.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc/base/makefile.kak b/rc/base/makefile.kak index a4c71ddd..cc3e7b05 100644 --- a/rc/base/makefile.kak +++ b/rc/base/makefile.kak @@ -24,7 +24,7 @@ addhl -group /makefile/content regex [+?:]= 0:operator %sh{ # Grammar - keywords="ifeq|ifneq|else|endif" + keywords="ifeq|ifneq|ifdef|ifndef|else|endif|define|endef" # Add the language's grammar to the static completion list printf %s\\n "hook global WinSetOption filetype=makefile %{ From 048004f3a463a8aa5988dc4d188f053e14f87e51 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Sun, 25 Sep 2016 09:13:39 +0300 Subject: [PATCH 2/4] Allow dashes in target names for syntax highlighting --- rc/base/makefile.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc/base/makefile.kak b/rc/base/makefile.kak index cc3e7b05..b168f5d9 100644 --- a/rc/base/makefile.kak +++ b/rc/base/makefile.kak @@ -19,7 +19,7 @@ addhl -group / regions -default content makefile \ addhl -group /makefile/comment fill comment addhl -group /makefile/eval fill value -addhl -group /makefile/content regex ^[\w.%]+\h*:\s 0:identifier +addhl -group /makefile/content regex ^[\w.%-]+\h*:\s 0:identifier addhl -group /makefile/content regex [+?:]= 0:operator %sh{ From 7d51dca290eea369c5f3a77ae7dca7712479da7f Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Sun, 25 Sep 2016 09:19:04 +0300 Subject: [PATCH 3/4] Indent after other keywords --- rc/base/makefile.kak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc/base/makefile.kak b/rc/base/makefile.kak index b168f5d9..08fbdfd0 100644 --- a/rc/base/makefile.kak +++ b/rc/base/makefile.kak @@ -46,8 +46,8 @@ def -hidden _makefile-indent-on-new-line %{ try %{ exec -draft Z k ^[^:]+:\s z i } # cleanup trailing white space son previous line try %{ exec -draft k s \h+$ d } - # indent after ifeq, ifneq, else - try %{ exec -draft Z k ^\h*(ifeq|ifneq|else)\b z } + # indent after some keywords + try %{ exec -draft Z k ^\h*(ifeq|ifneq|ifdef|ifndef|else|define)\b z } } } From b26d083627cb8610676f7ce0fb50e5d3d3dac3bc Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Sun, 25 Sep 2016 09:19:56 +0300 Subject: [PATCH 4/4] Place the Makefile highlighting script alongside the `make` support script --- rc/{base => core}/makefile.kak | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rc/{base => core}/makefile.kak (100%) diff --git a/rc/base/makefile.kak b/rc/core/makefile.kak similarity index 100% rename from rc/base/makefile.kak rename to rc/core/makefile.kak