diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/color.tes | 16 | ||||
| -rw-r--r-- | lib/colors/solarized.tes | 2 | ||||
| -rw-r--r-- | lib/lexer.tes | 9 | ||||
| -rw-r--r-- | lib/lexers/bash.tes | 8 | ||||
| -rw-r--r-- | lib/lexers/batch.tes | 3 | ||||
| -rw-r--r-- | lib/lexers/make.tes | 3 | ||||
| -rw-r--r-- | lib/lexers/sciteco.tes | bin | 697 -> 809 bytes | |||
| -rw-r--r-- | lib/lexers/yaml.tes | 2 |
8 files changed, 30 insertions, 13 deletions
diff --git a/lib/color.tes b/lib/color.tes index 347f29b..a45c646 100644 --- a/lib/color.tes +++ b/lib/color.tes @@ -80,11 +80,13 @@ :M[color.bracelight],34M[color.set] :M[color.error],35M[color.set] - !* Configure fold margin *! - :M[color.linenumber]U.fU.b - Q.b,1ESSETFOLDMARGINCOLOUR Q.b,1ESSETFOLDMARGINHICOLOUR - 25U.x 7<Q.f,Q.xESMARKERSETFORE Q.b,Q.xESMARKERSETBACK %.x> - 10000+ +,25ESMARKERDEFINE 10000+ -,26ESMARKERDEFINE - 10000+ +,30ESMARKERDEFINE 10000+ -,31ESMARKERDEFINE - (2^*25 # 2^*26 # 2^*30 # 2^*31),2ESSETMARGINMASKN 0,2ESSETMARGINTYPEN + !* Configure fold margin (except on the command line) *! + ED&2048"= + :M[color.linenumber]U.fU.b + Q.b,1ESSETFOLDMARGINCOLOUR Q.b,1ESSETFOLDMARGINHICOLOUR + 25U.x 7<Q.f,Q.xESMARKERSETFORE Q.b,Q.xESMARKERSETBACK %.x> + 10000+ +,25ESMARKERDEFINE 10000+ -,26ESMARKERDEFINE + 10000+ +,30ESMARKERDEFINE 10000+ -,31ESMARKERDEFINE + (2^*25 # 2^*26 # 2^*30 # 2^*31),2ESSETMARGINMASKN 0,2ESSETMARGINTYPEN + ' } diff --git a/lib/colors/solarized.tes b/lib/colors/solarized.tes index fd0823e..11567d9 100644 --- a/lib/colors/solarized.tes +++ b/lib/colors/solarized.tes @@ -131,6 +131,8 @@ Q[solarized.light]"T :M[solarized.light] | :M[solarized.dark] ' [* EJ<%.bEB M[lexer.auto]> EQ.b :M[color.init] + !* FIXME: What if the user disabled it in .teco_ini? *! + :M[lexer.set.cmdline] ]* } diff --git a/lib/lexer.tes b/lib/lexer.tes index 4e3e1b5..af6793a 100644 --- a/lib/lexer.tes +++ b/lib/lexer.tes @@ -39,3 +39,12 @@ :@[lexer.auto]{ ]_ } + +@[lexer.set.cmdline]{ + 0,2048ED + :M[color.init] + !* indicator for rubbed out part of the command line *! + :M[color.default],8ESINDICSETFORE + :M[lexer.set.sciteco] + 2048,0ED +} diff --git a/lib/lexers/bash.tes b/lib/lexers/bash.tes index 862a0c1..893fc8d 100644 --- a/lib/lexers/bash.tes +++ b/lib/lexers/bash.tes @@ -35,10 +35,12 @@ :M[color.number],3M[color.set] :M[color.keyword],4M[color.set] :M[color.string],5M[color.set] - :M[color.string],6M[color.set] + :M[color.string2],6M[color.set] :M[color.operator],7M[color.set] - :M[color.target],8M[color.set] !* Identifiers, e.g. FOO=... *! + !!:M[color.target],8M[color.set] !* Identifiers, e.g. FOO=... *! :M[color.variable],9M[color.set] :M[color.variable],10M[color.set] - :M[color.string2],11M[color.set] !* Backticks *! + :M[color.preproc],11M[color.set] !* Backticks *! + :M[color.target],12M[color.set] !* Heredoc delimiter *! + :M[color.preproc2],13M[color.set] !* Heredoc *! } diff --git a/lib/lexers/batch.tes b/lib/lexers/batch.tes index dddd802..97717a1 100644 --- a/lib/lexers/batch.tes +++ b/lib/lexers/batch.tes @@ -17,7 +17,8 @@ :M[color.keyword],2M[color.set] :M[color.target],3M[color.set] !* Labels *! :M[color.preproc],4M[color.set] !* Hide Cmd @ *! - :M[color.preproc2],5M[color.set] !* External Cmd *! + !!:M[color.preproc2],5M[color.set] !* External Cmd *! :M[color.variable],6M[color.set] :M[color.operator],7M[color.set] + :M[color.preproc2],8M[color.set] !* After label *! } diff --git a/lib/lexers/make.tes b/lib/lexers/make.tes index 4ff519a..68acda1 100644 --- a/lib/lexers/make.tes +++ b/lib/lexers/make.tes @@ -3,6 +3,7 @@ @[lexer.test.make]{ :EN*/MakefileQ*"S -1 ' :EN*/makefileQ*"S -1 ' + :EN*/GNUmakefileQ*"S -1 ' :EN*.makQ* } @@ -13,5 +14,5 @@ :M[color.variable],3M[color.set] :M[color.operator],4M[color.set] :M[color.target],5M[color.set] - :M[color.error],6M[color.set] + :M[color.error],9M[color.set] } diff --git a/lib/lexers/sciteco.tes b/lib/lexers/sciteco.tes Binary files differindex 7ca9c70..0e7db64 100644 --- a/lib/lexers/sciteco.tes +++ b/lib/lexers/sciteco.tes diff --git a/lib/lexers/yaml.tes b/lib/lexers/yaml.tes index 631f83a..2102afa 100644 --- a/lib/lexers/yaml.tes +++ b/lib/lexers/yaml.tes @@ -17,7 +17,7 @@ ESSETILEXERyaml 0ESSETKEYWORDStrue false yes no :M[color.comment],1M[color.set] - :M[color.target],2M[color.set] + :M[color.string],2M[color.set] :M[color.keyword],3M[color.set] :M[color.number],4M[color.set] :M[color.variable],5M[color.set] |