Get rid of txl prefix from symbols.

* genvim.txr: Let's not get rid of this just from
the instructions comment, but from the internals.
txl-* replaced with tl-*.

1 files changed, 23 insertions, 23 deletions

diff --git a/genvim.txr b/genvim.txr
index af484b1d..732659cf 100644
--- a/genvim.txr
+++ b/genvim.txr
@@ -11,7 +11,7 @@ static void dir_tables_init(void)
                  ifa txr-if with-resources path-exists-p
                  defstruct)))
        (boundp s)))
-@(bind txl-orig-sym
+@(bind tl-orig-sym
        @(append-each* ((entry (package-alist))
                        (pkg-name [mapcar car entry])
                        (pkg [mapcar cdr entry]))
@@ -20,8 +20,8 @@ static void dir_tables_init(void)
                       (mboundp sym) (special-operator-p sym)
                       (constantp sym))
               (list sym)))))
-@(bind txl-sym
-       @(append-each ((sym txl-orig-sym))
+@(bind tl-sym
+       @(append-each ((sym tl-orig-sym))
            (let* ((pkg (symbol-package sym))
                   (pkg-name (package-name pkg))
                   (qualif (casequal pkg-name
@@ -36,8 +36,8 @@ static void dir_tables_init(void)
                            "single" "first" "last" "empty" "mod" "modlast"
                            "include")))
 @(set txr-sym @(sort (uniq txr-sym)))
-@(set (txl-sym txl-orig-sym) @(multi-sort (list txl-sym txl-orig-sym)
-                                          [list less]))
+@(set (tl-sym tl-orig-sym) @(multi-sort (list tl-sym tl-orig-sym)
+                                        [list less]))
 @(bind bs "\\\\")
 @(bind hex "0-9A-Fa-f")
 @(bind at "\\(@[ \\t]*\\)")
@@ -47,8 +47,8 @@ static void dir_tables_init(void)
 @(bind oct "0-7")
 @(bind chesc `abtnvfre@bs \\n`)
 @(bind glyph `!$%&*+\\-<=>?@{bs}_~`)
-@(bind lispwords @(append-each ((sym txl-orig-sym)
-                                (text txl-sym))
+@(bind lispwords @(append-each ((sym tl-orig-sym)
+                                (text tl-sym))
                     (if (or (special-operator-p sym)
                             (mboundp sym))
                       (unless (memq sym '(and dwim inc oand opip or pset
@@ -82,7 +82,7 @@ syn case match
 syn spell toplevel
 
 setlocal iskeyword=a-z,A-Z,48-57,!,$,&,*,+,-,:,<,=,>,?,\\,_,~,/
-@  (rep) @{txl-sym}@(mod 0 4)@\nsyn keyword txl_keyword contained @{txl-sym}@(end)
+@  (rep) @{tl-sym}@(mod 0 4)@\nsyn keyword tl_keyword contained @{tl-sym}@(end)
 @  (end)
 @  (if txr-p)
 @    (output :continue out)
@@ -122,15 +122,15 @@ syn match txr_num "#x[+\-]\?[@hex]\+"@(if txr-p " contained")
 syn match txr_num "#o[+\-]\?[@oct]\+"@(if txr-p " contained")
 syn match txr_num "#b[+\-]\?[01]\+"@(if txr-p " contained")
 syn match txr_ident "[@alnum@glyph]*[@alpha@glyph^][@alnum@glyph^]*" contained
-syn match txl_ident "[:@@][@alnum@glyph^/]\+"@(if txr-p " contained")
+syn match tl_ident "[:@@][@alnum@glyph^/]\+"@(if txr-p " contained")
 syn match txr_braced_ident "[:][@alnum@glyph^/]\+" contained
-syn match txl_ident "[@alnum@glyph/]*[@alpha@glyph^/#][@alnum@glyph^/#]*"@(if txr-p " contained")
+syn match tl_ident "[@alnum@glyph/]*[@alpha@glyph^/#][@alnum@glyph^/#]*"@(if txr-p " contained")
 syn match txr_num "[+\-]\?[@dig]\+\([^@alnum@glyph^/#]\|\n\)"me=e-1@(if txr-p " contained")
 syn match txr_badnum "[+\-]\?[@dig]*[.][@dig]\+\([eE][+\-]\?[@dig]\+\)\?[@alpha@glyph^/#]\+"@(if txr-p " contained")
 syn match txr_num "[+\-]\?[@dig]*[.][@dig]\+\([eE][+\-]\?[@dig]\+\)\?\([^@alnum@glyph^/#]\|\n\)"me=e-1@(if txr-p " contained")
 syn match txr_num "[+\-]\?[@dig]\+\([eE][+\-]\?[@dig]\+\)\([^@alnum@glyph^/#]\|\n\)"me=e-1@(if txr-p " contained")
-syn match txl_ident ":"@(if txr-p " contained")
-syn match txl_splice "[ \t,]\|,[*]"@(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
 syn match txr_splice ",\*" contained
@@ -139,22 +139,22 @@ syn match txr_quote "\^" contained
 syn match txr_dotdot "\.\." contained
 syn match txr_metaat "@@" contained
 
-syn region txr_bracevar matchgroup=Delimiter start="@@[ \t]*[*]\?{" matchgroup=Delimiter end="}" contains=txr_num,txl_ident,txl_splice,txl_metanum,txr_metaat,txr_braced_ident,txr_dot,txr_dotdot,txr_string,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_regex,txr_quasilit,txr_chr,txl_splice,txr_nested_error
+syn region txr_bracevar matchgroup=Delimiter start="@@[ \t]*[*]\?{" matchgroup=Delimiter end="}" contains=txr_num,tl_ident,tl_splice,tl_metanum,txr_metaat,txr_braced_ident,txr_dot,txr_dotdot,txr_string,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_regex,txr_quasilit,txr_chr,tl_splice,txr_nested_error
 @  (end)
 @  (if txr-p)
 @    (output :continue out)
-syn region txr_directive matchgroup=Delimiter start="@@[ \t]*(" matchgroup=Delimiter end=")" contains=txr_keyword,txr_string,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_quasilit,txr_num,txr_badnum,txl_ident,txl_regex,txr_string,txr_chr,txr_quote,txr_unquote,txr_splice,txr_dot,txr_dotdot,txr_metaat,txr_ncomment,txr_nested_error
+syn region txr_directive matchgroup=Delimiter start="@@[ \t]*(" matchgroup=Delimiter end=")" contains=txr_keyword,txr_string,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_quasilit,txr_num,txr_badnum,tl_ident,tl_regex,txr_string,txr_chr,txr_quote,txr_unquote,txr_splice,txr_dot,txr_dotdot,txr_metaat,txr_ncomment,txr_nested_error
 @    (end)
 @  (end)
 @  (output :continue out)
-syn region txr_list @(if txr-p "contained ")matchgroup=Delimiter start="#\?H\?(" matchgroup=Delimiter end=")" contains=txl_keyword,txr_string,txl_regex,txr_num,txr_badnum,txl_ident,txr_metanum,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_quasilit,txr_chr,txr_quote,txr_unquote,txr_splice,txr_dot,txr_dotdot,txr_metaat,txr_ncomment,txr_nested_error
-syn region txr_bracket @(if txr-p "contained ")matchgroup=Delimiter start="\[" matchgroup=Delimiter end="\]" contains=txl_keyword,txr_string,txl_regex,txr_num,txr_badnum,txl_ident,txr_metanum,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_quasilit,txr_chr,txr_quote,txr_unquote,txr_splice,txr_dot,txr_dotdot,txr_metaat,txr_ncomment,txr_nested_error
-syn region txr_mlist @(if txr-p "contained ")matchgroup=Delimiter start="@@[ \t^',]*(" matchgroup=Delimiter end=")" contains=txl_keyword,txr_string,txl_regex,txr_num,txr_badnum,txl_ident,txr_metanum,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_quasilit,txr_chr,txr_quote,txr_unquote,txr_splice,txr_dot,txr_dotdot,txr_metaat,txr_ncomment,txr_nested_error
-syn region txr_mbracket matchgroup=Delimiter start="@@[ \t^',]*\[" matchgroup=Delimiter end="\]" contains=txl_keyword,txr_string,txl_regex,txr_num,txr_badnum,txl_ident,txr_metanum,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_quasilit,txr_chr,txr_quote,txr_unquote,txr_splice,txr_dot,txr_dotdot,txr_metaat,txr_ncomment,txr_nested_error
+syn region txr_list @(if txr-p "contained ")matchgroup=Delimiter start="#\?H\?(" matchgroup=Delimiter end=")" contains=tl_keyword,txr_string,tl_regex,txr_num,txr_badnum,tl_ident,txr_metanum,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_quasilit,txr_chr,txr_quote,txr_unquote,txr_splice,txr_dot,txr_dotdot,txr_metaat,txr_ncomment,txr_nested_error
+syn region txr_bracket @(if txr-p "contained ")matchgroup=Delimiter start="\[" matchgroup=Delimiter end="\]" contains=tl_keyword,txr_string,tl_regex,txr_num,txr_badnum,tl_ident,txr_metanum,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_quasilit,txr_chr,txr_quote,txr_unquote,txr_splice,txr_dot,txr_dotdot,txr_metaat,txr_ncomment,txr_nested_error
+syn region txr_mlist @(if txr-p "contained ")matchgroup=Delimiter start="@@[ \t^',]*(" matchgroup=Delimiter end=")" contains=tl_keyword,txr_string,tl_regex,txr_num,txr_badnum,tl_ident,txr_metanum,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_quasilit,txr_chr,txr_quote,txr_unquote,txr_splice,txr_dot,txr_dotdot,txr_metaat,txr_ncomment,txr_nested_error
+syn region txr_mbracket matchgroup=Delimiter start="@@[ \t^',]*\[" matchgroup=Delimiter end="\]" contains=tl_keyword,txr_string,tl_regex,txr_num,txr_badnum,tl_ident,txr_metanum,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_quasilit,txr_chr,txr_quote,txr_unquote,txr_splice,txr_dot,txr_dotdot,txr_metaat,txr_ncomment,txr_nested_error
 syn region txr_string @(if txr-p "contained ")start=+#\?\*\?"+ end=+["\n]+ contains=txr_stresc,txr_numesc,txr_badesc
 syn region txr_quasilit @(if txr-p "contained ")start=+#\?\*\?`+ end=+[`\n]+ contains=txr_splicevar,txr_metanum,txr_bracevar,txr_mlist,txr_mbracket,txr_escat,txr_stresc,txr_numesc,txr_badesc
 syn region txr_regex @(if txr-p "contained ")start="/" end="[/\n]" contains=txr_regesc,txr_numesc,txr_badesc
-syn region txl_regex @(if txr-p "contained ")start="#/" end="[/\n]" contains=txr_regesc,txr_numesc,txr_badesc
+syn region tl_regex @(if txr-p "contained ")start="#/" end="[/\n]" contains=txr_regesc,txr_numesc,txr_badesc
 
 hi def link txr_at Special
 hi def link txr_atstar Special
@@ -165,12 +165,12 @@ hi def link txr_hashbang Preproc
 hi def link txr_contin Preproc
 hi def link txr_char String
 hi def link txr_keyword Keyword
-hi def link txl_keyword Type
+hi def link tl_keyword Type
 hi def link txr_string String
 hi def link txr_chr String
 hi def link txr_quasilit String
 hi def link txr_regex String
-hi def link txl_regex String
+hi def link tl_regex String
 hi def link txr_regdir String
 hi def link txr_variable Identifier
 hi def link txr_splicevar Identifier
@@ -181,7 +181,7 @@ hi def link txr_numesc Special
 hi def link txr_regesc Special
 hi def link txr_badesc Error
 hi def link txr_ident Identifier
-hi def link txl_ident Identifier
+hi def link tl_ident Identifier
 hi def link txr_num Number
 hi def link txr_badnum Error
 hi def link txr_quote Special
@@ -191,7 +191,7 @@ hi def link txr_dot Special
 hi def link txr_dotdot Special
 hi def link txr_metaat Special
 hi def link txr_munqspl Special
-hi def link txl_splice Special
+hi def link tl_splice Special
 hi def link txr_error Error
 hi def link txr_nested_error Error