vim: fix highlighting for uninterned symbols

* genvim.txr (tl_ident): Remove one rule, and make
sure the other matches an optional : or #:
(txr_braced_ident): Match optional : or #: prefix.

1 files changed, 3 insertions, 4 deletions

diff --git a/genvim.txr b/genvim.txr
index a4644eb8..3c869e3d 100644
--- a/genvim.txr
+++ b/genvim.txr
@@ -158,9 +158,8 @@ syn match txr_hashbang "\%^#!.*"
 syn match txr_qat "@at" nextgroup=@{txr-qelem} contained
 syn match txr_dot "\." contained
 syn match txr_ident "[@alnum@glyph]*[@alpha@glyph^][@alnum@glyph^]*" contained
-syn match tl_ident "[:][@alnum@glyph^/]\+"@(if txr-p " contained")
-syn match txr_braced_ident "[:][@alnum@glyph^/]\+" contained
-syn match tl_ident "[@alnum@glyph/]\+[@alnum@glyph^/#]*"@(if txr-p " contained")
+syn match txr_braced_ident "\(#\?:\)\?[[@alnum@glyph^/]\+" contained
+syn match tl_ident "\(#\?:\)\?[@alnum@glyph/]\+[@alnum@glyph^/#]*"@(if txr-p " contained")
 syn match txr_pnum "#[xob][+\-]\?[@alnum,]\+" contains=txr_xnum,txr_bnum,txr_onum@(if txr-p " contained")
 syn match txr_xnum "#x[+\-]\?@hexsep" containedin=txr_pnum contained
 syn match txr_onum "#o[+\-]\?@octsep" containedin=txr_pnum contained
@@ -169,7 +168,7 @@ syn match txr_num "[+\-]\?@digsep\?[.]@digsep\([eE][+\-]\?[@dig]\+\)\?"@(if txr-
 syn match txr_num "[+\-]\?@digsep[.]\?\([eE][+\-]\?[@dig]\+\)"@(if txr-p " contained")
 syn match txr_badnum "[+\-]\?@digsep\?[.]@digsep\([@{alpha-noe}@glyph^/#]\|[eE][^+\-@dig]\|[eE][+/-]\?$\|[eE][+\-][^0-9]\)"@(if txr-p " contained")
 syn match txr_badnum "[+\-]\?@digsep[.]\?\([@{alpha-noe}@glyph^/#]\|[eE][^+\-@dig]\|[eE][+/-]\?$\|[eE][+\-][^0-9]\)"@(if txr-p " contained")
-syn match tl_ident ":"@(if txr-p " contained")
+syn match tl_ident "#\?:"@(if txr-p " contained")
 syn match tl_splice "[ \t,]\|,[*]"@(if txr-p " contained")
 
 syn match txr_unquote "," contained