Merge remote-tracking branch 'lenormf/fix-tupfile'
This commit is contained in:
commit
b5de3064e0
|
@ -16,7 +16,7 @@ static = no
|
|||
suffix = .opt
|
||||
|
||||
CXX = g++
|
||||
CXXFLAGS = -pedantic -std=gnu++11 -Wall -Wno-reorder -Wno-sign-compare -Wno-address
|
||||
CXXFLAGS = -pedantic -std=gnu++14 -Wall -Wno-unused-parameter -Wno-reorder -Wno-sign-compare -Wno-address -Wno-noexcept-type -Wno-unknown-attributes -Wno-unknown-warning-option
|
||||
CPPFLAGS =
|
||||
LDFLAGS =
|
||||
LIBS =
|
||||
|
@ -43,8 +43,8 @@ else
|
|||
LIBS += -lncursesw -ldbghelp
|
||||
CPPFLAGS += -D_XOPEN_SOURCE=700
|
||||
else
|
||||
LIBS += -lncursesw
|
||||
CPPFLAGS += -I/usr/include/ncursesw
|
||||
LIBS += `pkg-config --libs ncursesw`
|
||||
CPPFLAGS += `pkg-config --cflags ncursesw`
|
||||
|
||||
ifeq ($(CXX),g++)
|
||||
LDFLAGS += -rdynamic
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# Detection
|
||||
# ‾‾‾‾‾‾‾‾‾
|
||||
|
||||
hook global BufCreate (.+/)?[Tt]upfile %{
|
||||
hook global BufCreate .*/?Tup(file|rules)(\.\w+)?$ %{
|
||||
set-option buffer filetype tupfile
|
||||
}
|
||||
|
||||
|
@ -19,11 +19,12 @@ add-highlighter shared/tupfile/string fill string
|
|||
add-highlighter shared/tupfile/comment fill comment
|
||||
|
||||
add-highlighter shared/tupfile/code regex "\%[fbBeoOdg]\b" 0:value
|
||||
add-highlighter shared/tupfile/code regex "\$\([\w_]+\)" 0:value
|
||||
add-highlighter shared/tupfile/code regex ":\s*(foreach)\b" 1:keyword
|
||||
add-highlighter shared/tupfile/code regex "\.gitignore\b" 0:keyword
|
||||
add-highlighter shared/tupfile/code regex "\b(ifn?eq|ifn?def|else|endif|error|include|include_rules|run|preload|export)\b" 0:keyword
|
||||
add-highlighter shared/tupfile/code regex "\b(&?[\w_]+)\s*[:+]?=" 1:keyword
|
||||
add-highlighter shared/tupfile/code regex "[$@]\([\w_]+\)" 0:value
|
||||
add-highlighter shared/tupfile/code regex "^\h*:\s*(foreach)\b" 1:keyword
|
||||
add-highlighter shared/tupfile/code regex "^\h*(\.gitignore)\b" 1:keyword
|
||||
add-highlighter shared/tupfile/code regex "^\h*\b(ifn?eq|ifn?def|else|endif|error|include|include_rules|run|preload|export)\b" 0:keyword
|
||||
add-highlighter shared/tupfile/code regex "^\h*\b(&?[\w_]+)\s*[:+]?=" 1:keyword
|
||||
add-highlighter shared/tupfile/code regex "`[^`\n]+`" 0:meta
|
||||
|
||||
# Initialization
|
||||
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾
|
||||
|
|
Loading…
Reference in New Issue
Block a user