mawww/kakoune
1
1
Fork 0
mirror of https://github.com/mawww/kakoune.git synced 2024-12-24 20:13:00 +03:00
Code Issues Projects Releases Wiki Activity

Rename 'macro' face to more general 'meta'

Browse Source 
As it is used in python/ruby for 'import' which is not really
a macro.
This commit is contained in:
Maxime Coste 2014-07-13 16:57:49 +01:00
parent e788417e3b
commit 518c494104
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rc/cpp.kak
View File

@ -47,7 +47,7 @@ addhl -group / multi_region -default code cpp \
addhl -group /cpp/string fill string addhl -group /cpp/string fill string
addhl -group /cpp/comment fill comment 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 "\<(this|true|false|NULL|nullptr|)\>|\<-?\d+[fdiu]?|'((\\.)?|[^'\\])'" 0:value
addhl -group /cpp/code regex "\<(void|int|char|unsigned|float|bool|size_t)\>" 0:type addhl -group /cpp/code regex "\<(void|int|char|unsigned|float|bool|size_t)\>" 0:type

2
rc/javascript.kak
View File

@ -24,7 +24,7 @@ addhl -group / multi_region -default code javascript \
addhl -group /javascript/double_string fill string addhl -group /javascript/double_string fill string
addhl -group /javascript/single_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/comment fill comment
addhl -group /javascript/code regex \<(document|false|null|parent|self|this|true|undefined|window)\> 0:value addhl -group /javascript/code regex \<(document|false|null|parent|self|this|true|undefined|window)\> 0:value

2
rc/python.kak
View File

@ -27,7 +27,7 @@ addhl -group /python/single_string fill string
addhl -group /python/comment fill comment addhl -group /python/comment fill comment
addhl -group /python/code regex \<(True|False|None)\> 0:value 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` # 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 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

14
rc/ruby.kak
View File

@ -32,19 +32,19 @@ addhl -group / multi_region -default code ruby \
addhl -group /ruby/double_string fill string addhl -group /ruby/double_string fill string
addhl -group /ruby/double_string region interpolation \Q#{ \} \{ 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/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 region interpolation \Q#{ \} \{
addhl -group /ruby/backtick/interpolation/content fill macro addhl -group /ruby/backtick/interpolation/content fill meta
addhl -group /ruby/regex fill macro addhl -group /ruby/regex fill meta
addhl -group /ruby/regex region interpolation \Q#{ \} \{ 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/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 \<([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 addhl -group /ruby/code regex \<(attr_(reader|writer|accessor))\> 0:attribute
# Keywords are collected searching for keyword_ at # Keywords are collected searching for keyword_ at

2
rc/yaml.kak
View File

@ -24,7 +24,7 @@ addhl -group /yaml/double_string fill string
addhl -group /yaml/single_string fill string addhl -group /yaml/single_string fill string
addhl -group /yaml/comment fill comment 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 ^(\h*:\w*) 0:keyword
addhl -group /yaml/code regex \<(true|false|null)\> 0:value addhl -group /yaml/code regex \<(true|false|null)\> 0:value

2
share/kak/kakrc
View File

@ -8,7 +8,7 @@ face keyword blue
face operator yellow face operator yellow
face attribute green face attribute green
face comment cyan face comment cyan
face macro magenta face meta magenta
def -shell-params runtime %{ %sh{ def -shell-params runtime %{ %sh{
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do