1 files changed, 13 insertions, 8 deletions
diff --git a/genvim.txr b/genvim.txr
index 114c40f1..bbd9bcc0 100644
--- a/genvim.txr
+++ b/genvim.txr
@@ -11,21 +11,26 @@ static void dir_tables_init(void)
                [mapcar open-file '("eval.c" "rand.c" "signal.c"
                                    "stream.c" "syslog.c" "txr.c")]])
 @(collect)
-@  (cases)
+@  (block)
+@    (cases)
+@/.*system_package.*/
+@      (accept)
+@    (or)
   reg_@/op|mac/(@{txl-sym-nostar}_star_s,@(skip)
-@    (bind txl-sym `@{txl-sym-nostar}*`)
-@  (or)
+@      (bind txl-sym `@{txl-sym-nostar}*`)
+@    (or)
   reg_@/op|mac/(@{txl-sym}_s,@(skip)
-@  (or)
+@    (or)
   reg_mac(intern(lit("@{txl-sym}")@(skip)
-@  (or)
+@    (or)
   reg_fun(intern(lit("@{txl-sym}")@(skip)
-@  (or)
+@    (or)
   reg_fun(@{txl-sym}_s,@(skip)
-@  (or)
+@    (or)
   @/ */reg_var(@(skip)intern(lit("@{txl-sym}")@(skip)
+@    (end)
+@    (set txl-sym @(regsub #/_/ #\- txl-sym))
 @  (end)
-@  (set txl-sym @(regsub #/_/ #\- txl-sym))
 @(end)
 @(do
    (defun sortuniq (list)