From 518c4941040b1963d56317141d2b47af184849c5 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Sun, 13 Jul 2014 16:57:49 +0100
Subject: [PATCH] Rename 'macro' face to more general 'meta'

As it is used in python/ruby for 'import' which is not really
a macro.
---
 rc/cpp.kak        |  2 +-
 rc/javascript.kak |  2 +-
 rc/python.kak     |  2 +-
 rc/ruby.kak       | 14 +++++++-------
 rc/yaml.kak       |  2 +-
 share/kak/kakrc   |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/rc/cpp.kak b/rc/cpp.kak
index 83732ec4..8d6d61c2 100644
--- a/rc/cpp.kak
+++ b/rc/cpp.kak
@@ -47,7 +47,7 @@ addhl -group / multi_region -default code cpp \
 
 addhl -group /cpp/string fill string
 addhl -group /cpp/comment fill comment
-addhl -group /cpp/macro fill macro
+addhl -group /cpp/macro fill meta
 
 addhl -group /cpp/code regex "\<(this|true|false|NULL|nullptr|)\>|\<-?\d+[fdiu]?|'((\\.)?|[^'\\])'" 0:value
 addhl -group /cpp/code regex "\<(void|int|char|unsigned|float|bool|size_t)\>" 0:type
diff --git a/rc/javascript.kak b/rc/javascript.kak
index ab99ba67..02bc7225 100644
--- a/rc/javascript.kak
+++ b/rc/javascript.kak
@@ -24,7 +24,7 @@ addhl -group / multi_region -default code javascript \
 
 addhl -group /javascript/double_string fill string
 addhl -group /javascript/single_string fill string
-addhl -group /javascript/regex         fill macro
+addhl -group /javascript/regex         fill meta
 addhl -group /javascript/comment       fill comment
 
 addhl -group /javascript/code regex \<(document|false|null|parent|self|this|true|undefined|window)\> 0:value
diff --git a/rc/python.kak b/rc/python.kak
index a78e3b1e..d2d2623f 100644
--- a/rc/python.kak
+++ b/rc/python.kak
@@ -27,7 +27,7 @@ addhl -group /python/single_string fill string
 addhl -group /python/comment       fill comment
 
 addhl -group /python/code regex \<(True|False|None)\> 0:value
-addhl -group /python/code regex \<(import|from)\> 0:macro
+addhl -group /python/code regex \<(import|from)\> 0:meta
 
 # Keyword list is collected using `keyword.kwlist` from `keyword`
 addhl -group /python/code regex \<(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|global|if|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\> 0:keyword
diff --git a/rc/ruby.kak b/rc/ruby.kak
index ed13642c..6d420721 100644
--- a/rc/ruby.kak
+++ b/rc/ruby.kak
@@ -32,19 +32,19 @@ addhl -group / multi_region -default code ruby  \
 
 addhl -group /ruby/double_string fill string
 addhl -group /ruby/double_string region interpolation \Q#{ \} \{
-addhl -group /ruby/double_string/interpolation/content fill macro
+addhl -group /ruby/double_string/interpolation/content fill meta
 addhl -group /ruby/single_string fill string
-addhl -group /ruby/backtick fill macro
+addhl -group /ruby/backtick fill meta
 addhl -group /ruby/backtick region interpolation \Q#{ \} \{
-addhl -group /ruby/backtick/interpolation/content fill macro
-addhl -group /ruby/regex fill macro
+addhl -group /ruby/backtick/interpolation/content fill meta
+addhl -group /ruby/regex fill meta
 addhl -group /ruby/regex region interpolation \Q#{ \} \{
-addhl -group /ruby/regex/interpolation/content fill macro
+addhl -group /ruby/regex/interpolation/content fill meta
 addhl -group /ruby/comment fill comment
-addhl -group /ruby/literal fill macro
+addhl -group /ruby/literal fill meta
 
 addhl -group /ruby/code regex \<([a-z]\w+:)|([$@][a-z]\w+)|(\W\K:[a-z]\w+[=?!]?) 0:identifier
-addhl -group /ruby/code regex \<(require|include)\> 0:macro
+addhl -group /ruby/code regex \<(require|include)\> 0:meta
 addhl -group /ruby/code regex \<(attr_(reader|writer|accessor))\> 0:attribute
 
 # Keywords are collected searching for keyword_ at
diff --git a/rc/yaml.kak b/rc/yaml.kak
index e24ad984..c80ca80b 100644
--- a/rc/yaml.kak
+++ b/rc/yaml.kak
@@ -24,7 +24,7 @@ addhl -group /yaml/double_string fill string
 addhl -group /yaml/single_string fill string
 addhl -group /yaml/comment       fill comment
 
-addhl -group /yaml/code regex ^(---|\.\.\.)$ 0:macro
+addhl -group /yaml/code regex ^(---|\.\.\.)$ 0:meta
 addhl -group /yaml/code regex ^(\h*:\w*) 0:keyword
 addhl -group /yaml/code regex \<(true|false|null)\> 0:value
 
diff --git a/share/kak/kakrc b/share/kak/kakrc
index 9ec0eb47..26db4b55 100644
--- a/share/kak/kakrc
+++ b/share/kak/kakrc
@@ -8,7 +8,7 @@ face keyword blue
 face operator yellow
 face attribute green
 face comment cyan
-face macro magenta
+face meta magenta
 
 def -shell-params runtime %{ %sh{
         while [ $# -gt 0 ]; do