summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--RELNOTES57
-rwxr-xr-xconfigure2
-rw-r--r--share/txr/stdlib/ver.tl2
-rw-r--r--tl.vim410
-rw-r--r--txr.14
-rw-r--r--txr.vim410
6 files changed, 479 insertions, 406 deletions
diff --git a/RELNOTES b/RELNOTES
index 13246dd4..c3a45aaa 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,60 @@
+ TXR 119
+ 2015-10-10
+
+
+ Features
+
+ - Interactive listener:
+ - New Ctrl-X Ctrl-R to insert entire previous line.
+ - Word/Atom from previous line works relative to recalled history line.
+ - New Ctrl-X Tab for substring-searching completion.
+ - Empty loops can be interrupted by signals: (for () () ()) is now
+ interruptible at the interactive prompt.
+ - New umethod and umeth function for indirecting on a method in a way
+ that is detached from an object instance.
+ - Boa construction of structures can have optional arguments now.
+ - copy and copy-str now copy lazy strings as lazy strings, rather
+ than forcing to regular string.
+ - New functions for sequence manipulation: take, take-while, take-until,
+ drop, drop-while, drop-until.
+ - New function ginterate for lazy generation which includes the terminating
+ item.
+ - New function expand-right for lazily generating a sequence in a roughly
+ opposite way to a reduce-right reduction.
+ - New function call-finalizers for explicitly invoking and clearing the
+ registered GC finalizers for an object.
+ - New functions clear-struct and reset-struct for clearing all slots
+ of a structure to nil, or reinitializing a struct to default values,
+ respective.
+ - New function replace-struct for changing and slot contents and type
+ of a struct to match an example object.
+ - Missing promisep function added to test whether an object is a promise
+ created by the delay macro.
+ - New defex macro, to define exception subtype relationships out of TXR Lisp.
+ (Previously available only in the TXR pattern language).
+ - Also useful surrounding functions: exception-subtype-p,
+ register-exception-subtype.
+ - New macros for working with streams in lexical scopes:
+ with-out-string-stream, with-out-strlist-stream with-in-string-stream,
+ with-in-string-byte-stream, with-stream.
+ - New with-objects macro for scoped finalization of objects,
+ somewhat like destruction in C++.
+ - Vim syntax highlighting file sets "lispwords" option for
+ more accurate indentation of TXR Lisp.
+
+ Bugs
+
+ - Fixed symbol-function throwing error on builtin macros.
+ - macro-time is now special-operator-p.
+ - Named block around bodies of methods and functions declared
+ in defstruct.
+ - slot-p renamed to slotp (old name supported in compatibility mode).
+ - Bug in structure initialization: boa arguments were applied first,
+ before other initialiations, rather than last.
+ - The conses function works on vectors and strings.
+
+
+
TXR 118
2015-10-01
diff --git a/configure b/configure
index 7652b270..7be0b6cf 100755
--- a/configure
+++ b/configure
@@ -433,7 +433,7 @@ fi
#
-txr_ver=118
+txr_ver=119
#
# The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index 709f82a6..fb73f29b 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 118)
+(defvarl lib-version 119)
(defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index 6081e1e6..70828b60 100644
--- a/tl.vim
+++ b/tl.vim
@@ -68,43 +68,45 @@ syn keyword txl_keyword contained cadaar cadadar cadaddr cadadr
syn keyword txl_keyword contained cadar caddaar caddadr caddar
syn keyword txl_keyword contained cadddar caddddr cadddr caddr
syn keyword txl_keyword contained cadr call call-clobber-expander call-delete-expander
-syn keyword txl_keyword contained call-super-fun call-super-method call-update-expander callf
-syn keyword txl_keyword contained car caseq caseql casequal
-syn keyword txl_keyword contained cat-str cat-streams cat-vec catch
-syn keyword txl_keyword contained catenated-stream-p catenated-stream-push cdaaaar cdaaadr
-syn keyword txl_keyword contained cdaaar cdaadar cdaaddr cdaadr
-syn keyword txl_keyword contained cdaar cdadaar cdadadr cdadar
-syn keyword txl_keyword contained cdaddar cdadddr cdaddr cdadr
-syn keyword txl_keyword contained cdar cddaaar cddaadr cddaar
-syn keyword txl_keyword contained cddadar cddaddr cddadr cddar
-syn keyword txl_keyword contained cdddaar cdddadr cdddar cddddar
-syn keyword txl_keyword contained cdddddr cddddr cdddr cddr
-syn keyword txl_keyword contained cdr ceil chain chand
-syn keyword txl_keyword contained chdir chmod chr-isalnum chr-isalpha
-syn keyword txl_keyword contained chr-isascii chr-isblank chr-iscntrl chr-isdigit
-syn keyword txl_keyword contained chr-isgraph chr-islower chr-isprint chr-ispunct
-syn keyword txl_keyword contained chr-isspace chr-isunisp chr-isupper chr-isxdigit
-syn keyword txl_keyword contained chr-num chr-str chr-str-set chr-tolower
-syn keyword txl_keyword contained chr-toupper chrp clamp clear-error
-syn keyword txl_keyword contained close-stream closelog cmp-str collect-each
-syn keyword txl_keyword contained collect-each* comb compl-span-str cond
-syn keyword txl_keyword contained conda cons conses conses*
-syn keyword txl_keyword contained consp constantp copy copy-alist
-syn keyword txl_keyword contained copy-cons copy-hash copy-list copy-str
-syn keyword txl_keyword contained copy-struct copy-vec cos count-if
-syn keyword txl_keyword contained countq countql countqual cum-norm-dist
-syn keyword txl_keyword contained daemon dec define-modify-macro define-place-macro
-syn keyword txl_keyword contained defmacro defparm defparml defplace
-syn keyword txl_keyword contained defstruct defsymacro defun defvar
-syn keyword txl_keyword contained defvarl del delay delete-package
-syn keyword txl_keyword contained display-width do dohash dotimes
-syn keyword txl_keyword contained downcase-str dup dupfd dwim
-syn keyword txl_keyword contained each each* eighth empty
-syn keyword txl_keyword contained endgrent endpwent ensure-dir env
-syn keyword txl_keyword contained env-fbind env-hash env-vbind eq
-syn keyword txl_keyword contained eql equal errno error
-syn keyword txl_keyword contained eval evenp exec exit
-syn keyword txl_keyword contained exit* exp expt exptmod
+syn keyword txl_keyword contained call-finalizers call-super-fun call-super-method call-update-expander
+syn keyword txl_keyword contained callf car caseq caseql
+syn keyword txl_keyword contained casequal cat-str cat-streams cat-vec
+syn keyword txl_keyword contained catch catenated-stream-p catenated-stream-push cdaaaar
+syn keyword txl_keyword contained cdaaadr cdaaar cdaadar cdaaddr
+syn keyword txl_keyword contained cdaadr cdaar cdadaar cdadadr
+syn keyword txl_keyword contained cdadar cdaddar cdadddr cdaddr
+syn keyword txl_keyword contained cdadr cdar cddaaar cddaadr
+syn keyword txl_keyword contained cddaar cddadar cddaddr cddadr
+syn keyword txl_keyword contained cddar cdddaar cdddadr cdddar
+syn keyword txl_keyword contained cddddar cdddddr cddddr cdddr
+syn keyword txl_keyword contained cddr cdr ceil chain
+syn keyword txl_keyword contained chand chdir chmod chr-isalnum
+syn keyword txl_keyword contained chr-isalpha chr-isascii chr-isblank chr-iscntrl
+syn keyword txl_keyword contained chr-isdigit chr-isgraph chr-islower chr-isprint
+syn keyword txl_keyword contained chr-ispunct chr-isspace chr-isunisp chr-isupper
+syn keyword txl_keyword contained chr-isxdigit chr-num chr-str chr-str-set
+syn keyword txl_keyword contained chr-tolower chr-toupper chrp clamp
+syn keyword txl_keyword contained clear-error clear-struct close-stream closelog
+syn keyword txl_keyword contained cmp-str collect-each collect-each* comb
+syn keyword txl_keyword contained compl-span-str cond conda cons
+syn keyword txl_keyword contained conses conses* consp constantp
+syn keyword txl_keyword contained copy copy-alist copy-cons copy-hash
+syn keyword txl_keyword contained copy-list copy-str copy-struct copy-vec
+syn keyword txl_keyword contained cos count-if countq countql
+syn keyword txl_keyword contained countqual cum-norm-dist daemon dec
+syn keyword txl_keyword contained defex define-modify-macro define-place-macro defmacro
+syn keyword txl_keyword contained defparm defparml defplace defstruct
+syn keyword txl_keyword contained defsymacro defun defvar defvarl
+syn keyword txl_keyword contained del delay delete-package display-width
+syn keyword txl_keyword contained do dohash dotimes downcase-str
+syn keyword txl_keyword contained drop drop-until drop-while dup
+syn keyword txl_keyword contained dupfd dwim each each*
+syn keyword txl_keyword contained eighth empty endgrent endpwent
+syn keyword txl_keyword contained ensure-dir env env-fbind env-hash
+syn keyword txl_keyword contained env-vbind eq eql equal
+syn keyword txl_keyword contained errno error eval evenp
+syn keyword txl_keyword contained exception-subtype-p exec exit exit*
+syn keyword txl_keyword contained exp expand-right expt exptmod
syn keyword txl_keyword contained false fboundp fifth fileno
syn keyword txl_keyword contained filter-equal filter-string-tree finalize find
syn keyword txl_keyword contained find-if find-max find-min find-package
@@ -125,170 +127,174 @@ syn keyword txl_keyword contained get-string-from-stream get-update-expander get
syn keyword txl_keyword contained geteuid getgid getgrent getgrgid
syn keyword txl_keyword contained getgrnam getgroups gethash getitimer
syn keyword txl_keyword contained getpid getppid getpwent getpwnam
-syn keyword txl_keyword contained getpwuid getuid giterate glob
-syn keyword txl_keyword contained glob-altdirfunc glob-brace glob-err glob-mark
-syn keyword txl_keyword contained glob-nocheck glob-noescape glob-nomagic glob-nosort
-syn keyword txl_keyword contained glob-onlydir glob-period glob-tilde glob-tilde-check
-syn keyword txl_keyword contained greater group-by gun hash
-syn keyword txl_keyword contained hash-alist hash-construct hash-count hash-diff
-syn keyword txl_keyword contained hash-eql hash-equal hash-from-pairs hash-isec
-syn keyword txl_keyword contained hash-keys hash-list hash-pairs hash-proper-subset
-syn keyword txl_keyword contained hash-revget hash-subset hash-uni hash-update
-syn keyword txl_keyword contained hash-update-1 hash-values hashp have
-syn keyword txl_keyword contained html-decode html-encode iapply identity
-syn keyword txl_keyword contained ido if ifa iff
-syn keyword txl_keyword contained iffi iflet ignerr in
-syn keyword txl_keyword contained inc inc-indent indent-code indent-data
-syn keyword txl_keyword contained indent-off inhash int-flo int-str
-syn keyword txl_keyword contained integerp intern interp-fun-p interpose
-syn keyword txl_keyword contained ip ipf isqrt itimer-prov
-syn keyword txl_keyword contained itimer-real itimer-virtual juxt keep-if
-syn keyword txl_keyword contained keep-if* keyword-package keywordp kill
-syn keyword txl_keyword contained labels lambda last lazy-str
-syn keyword txl_keyword contained lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons
-syn keyword txl_keyword contained lazy-stringp lcm lcons lcons-fun
-syn keyword txl_keyword contained lconsp ldiff length length-list
-syn keyword txl_keyword contained length-str length-str-< length-str-<= length-str->
-syn keyword txl_keyword contained length-str->= length-vec lequal less
-syn keyword txl_keyword contained let let* lexical-fun-p lexical-lisp1-binding
-syn keyword txl_keyword contained lexical-var-p lib-version link lisp-parse
-syn keyword txl_keyword contained list list* list-str list-vector
-syn keyword txl_keyword contained listp load log log-alert
-syn keyword txl_keyword contained log-auth log-authpriv log-cons log-crit
-syn keyword txl_keyword contained log-daemon log-debug log-emerg log-err
-syn keyword txl_keyword contained log-info log-ndelay log-notice log-nowait
-syn keyword txl_keyword contained log-odelay log-perror log-pid log-user
-syn keyword txl_keyword contained log-warning log10 log2 logand
-syn keyword txl_keyword contained logior lognot logtest logtrunc
-syn keyword txl_keyword contained logxor lstat mac-param-bind macro-form-p
-syn keyword txl_keyword contained macro-time macroexpand macroexpand-1 macrolet
-syn keyword txl_keyword contained major make-catenated-stream make-env make-hash
-syn keyword txl_keyword contained make-lazy-cons make-like make-package make-random-state
-syn keyword txl_keyword contained make-similar-hash make-string-byte-input-stream make-string-input-stream make-string-output-stream
-syn keyword txl_keyword contained make-strlist-output-stream make-struct make-struct-type make-sym
-syn keyword txl_keyword contained make-time make-time-utc make-trie makedev
-syn keyword txl_keyword contained makunbound mapcar mapcar* mapdo
-syn keyword txl_keyword contained mapf maphash mappend mappend*
-syn keyword txl_keyword contained mask match-fun match-regex match-regex-right
-syn keyword txl_keyword contained match-regst match-regst-right match-str match-str-tree
-syn keyword txl_keyword contained max member member-if memq
-syn keyword txl_keyword contained memql memqual merge meth
-syn keyword txl_keyword contained method min minor minusp
-syn keyword txl_keyword contained mkdir mknod mkstring mlet
-syn keyword txl_keyword contained mod multi multi-sort n-choose-k
-syn keyword txl_keyword contained n-perm-k nconc new nil
-syn keyword txl_keyword contained nilf ninth none not
-syn keyword txl_keyword contained notf nreverse nthcdr null
-syn keyword txl_keyword contained nullify num-chr num-str numberp
-syn keyword txl_keyword contained oand oddp op open-command
-syn keyword txl_keyword contained open-directory open-file open-fileno open-files
-syn keyword txl_keyword contained open-files* open-pipe open-process open-tail
-syn keyword txl_keyword contained openlog opip or orf
-syn keyword txl_keyword contained package-alist package-name package-symbols packagep
-syn keyword txl_keyword contained pad partition partition* partition-by
-syn keyword txl_keyword contained path-blkdev-p path-chrdev-p path-dir-p path-executable-to-me-p
-syn keyword txl_keyword contained path-exists-p path-file-p path-mine-p path-my-group-p
-syn keyword txl_keyword contained path-newer path-older path-pipe-p path-private-to-me-p
-syn keyword txl_keyword contained path-same-object path-setgid-p path-setuid-p path-sock-p
-syn keyword txl_keyword contained path-sticky-p path-symlink-p path-writable-to-me-p perm
-syn keyword txl_keyword contained pipe place-form-p placelet placelet*
-syn keyword txl_keyword contained plusp poll poll-err poll-in
-syn keyword txl_keyword contained poll-nval poll-out poll-pri poll-rdband
-syn keyword txl_keyword contained poll-wrband pop pos pos-if
-syn keyword txl_keyword contained pos-max pos-min posq posql
-syn keyword txl_keyword contained posqual pppred ppred pprinl
-syn keyword txl_keyword contained pprint pprof pred prinl
-syn keyword txl_keyword contained print prof prog1 progn
-syn keyword txl_keyword contained prop proper-listp pset push
-syn keyword txl_keyword contained pushhash pushnew put-byte put-char
-syn keyword txl_keyword contained put-line put-lines put-string put-strings
-syn keyword txl_keyword contained pwd qquote qref quote
-syn keyword txl_keyword contained raise rand random random-fixnum
-syn keyword txl_keyword contained random-state-p range range* range-regex
-syn keyword txl_keyword contained rcomb read readlink real-time-stream-p
-syn keyword txl_keyword contained reduce-left reduce-right ref refset
-syn keyword txl_keyword contained regex-compile regex-parse regexp regsub
-syn keyword txl_keyword contained rehome-sym remhash remove-if remove-if*
-syn keyword txl_keyword contained remove-path remq remq* remql
-syn keyword txl_keyword contained remql* remqual remqual* rename-path
-syn keyword txl_keyword contained repeat replace replace-list replace-str
-syn keyword txl_keyword contained replace-vec rest ret retf
-syn keyword txl_keyword contained return return-from reverse rlcp
-syn keyword txl_keyword contained rlet rotate rperm rplaca
-syn keyword txl_keyword contained rplacd run s-ifblk s-ifchr
-syn keyword txl_keyword contained s-ifdir s-ififo s-iflnk s-ifmt
-syn keyword txl_keyword contained s-ifreg s-ifsock s-irgrp s-iroth
-syn keyword txl_keyword contained s-irusr s-irwxg s-irwxo s-irwxu
-syn keyword txl_keyword contained s-isgid s-isuid s-isvtx s-iwgrp
-syn keyword txl_keyword contained s-iwoth s-iwusr s-ixgrp s-ixoth
-syn keyword txl_keyword contained s-ixusr search search-regex search-regst
-syn keyword txl_keyword contained search-str search-str-tree second seek-stream
-syn keyword txl_keyword contained select self-path seqp set
-syn keyword txl_keyword contained set-diff set-hash-userdata set-indent set-indent-mode
-syn keyword txl_keyword contained set-sig-handler setegid setenv seteuid
-syn keyword txl_keyword contained setgid setgrent sethash setitimer
-syn keyword txl_keyword contained setlogmask setpwent setuid seventh
-syn keyword txl_keyword contained sh shift shuffle sig-abrt
-syn keyword txl_keyword contained sig-alrm sig-bus sig-check sig-chld
-syn keyword txl_keyword contained sig-cont sig-fpe sig-hup sig-ill
-syn keyword txl_keyword contained sig-int sig-io sig-iot sig-kill
-syn keyword txl_keyword contained sig-pipe sig-poll sig-prof sig-pwr
-syn keyword txl_keyword contained sig-quit sig-segv sig-stkflt sig-stop
-syn keyword txl_keyword contained sig-sys sig-term sig-trap sig-tstp
-syn keyword txl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
-syn keyword txl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
-syn keyword txl_keyword contained sig-xfsz sign-extend sin sixth
-syn keyword txl_keyword contained size-vec slot slot-p slotset
-syn keyword txl_keyword contained some sort sort-group source-loc
-syn keyword txl_keyword contained source-loc-str span-str special-operator-p special-var-p
-syn keyword txl_keyword contained splice split split-str split-str-set
-syn keyword txl_keyword contained sqrt sssucc ssucc stat
-syn keyword txl_keyword contained static-slot static-slot-p static-slot-set stdlib
-syn keyword txl_keyword contained str< str<= str= str>
-syn keyword txl_keyword contained str>= stream-get-prop stream-set-prop streamp
-syn keyword txl_keyword contained string-extend string-lt stringp struct-type
-syn keyword txl_keyword contained struct-type-p structp sub sub-list
-syn keyword txl_keyword contained sub-str sub-vec subtypep succ
-syn keyword txl_keyword contained super super-method swap symacrolet
-syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
-syn keyword txl_keyword contained symbolp symlink sys:*lisp1* sys:bad-slot-syntax
-syn keyword txl_keyword contained sys:do-path-test sys:dwim-del sys:dwim-set sys:eval-err
-syn keyword txl_keyword contained sys:expand sys:expr sys:fbind sys:gc
-syn keyword txl_keyword contained sys:gc-set-delta sys:get-fb sys:get-vb sys:l1-setq
-syn keyword txl_keyword contained sys:l1-val sys:lbind sys:lisp1-setq sys:lisp1-value
-syn keyword txl_keyword contained sys:load sys:make-struct-type sys:mark-special sys:path-access
-syn keyword txl_keyword contained sys:path-examine sys:path-test sys:path-test-mode sys:pl-expand
-syn keyword txl_keyword contained sys:placelet-1 sys:qquote sys:quasi sys:quasilist
-syn keyword txl_keyword contained sys:reg-expand-nongreedy sys:reg-optimize sys:rplaca sys:rplacd
-syn keyword txl_keyword contained sys:setq sys:setqf sys:splice sys:struct-lit
-syn keyword txl_keyword contained sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander sys:top-fb
-syn keyword txl_keyword contained sys:top-vb sys:trigger-load sys:unquote sys:var
-syn keyword txl_keyword contained sys:with-saved-vars syslog system-package t
-syn keyword txl_keyword contained tan tb tc tenth
-syn keyword txl_keyword contained test-set-indent-mode tf third throw
-syn keyword txl_keyword contained throwf time time-fields-local time-fields-utc
-syn keyword txl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
-syn keyword txl_keyword contained time-usec tofloat toint tok-str
-syn keyword txl_keyword contained tok-where tostring tostringp tprint
-syn keyword txl_keyword contained transpose tree-bind tree-case tree-find
-syn keyword txl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
-syn keyword txl_keyword contained trie-value-at trim-str true trunc
-syn keyword txl_keyword contained trunc-rem tuples txr-case txr-case-impl
-syn keyword txl_keyword contained txr-if txr-version txr-when typeof
-syn keyword txl_keyword contained typep unget-byte unget-char uniq
-syn keyword txl_keyword contained unique unless unquote unsetenv
-syn keyword txl_keyword contained until until* unwind-protect upcase-str
-syn keyword txl_keyword contained update url-decode url-encode user-package
-syn keyword txl_keyword contained usleep vec vec-push vec-set-length
-syn keyword txl_keyword contained vecref vector vector-list vectorp
-syn keyword txl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
-syn keyword txl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
-syn keyword txl_keyword contained w-stopsig w-termsig w-untraced wait
-syn keyword txl_keyword contained weave when whenlet where
-syn keyword txl_keyword contained while while* whilet width
-syn keyword txl_keyword contained width-check with-clobber-expander with-delete-expander with-gensyms
-syn keyword txl_keyword contained with-resources with-update-expander wrap wrap*
-syn keyword txl_keyword contained zap zerop zip
+syn keyword txl_keyword contained getpwuid getuid ginterate giterate
+syn keyword txl_keyword contained glob glob-altdirfunc glob-brace glob-err
+syn keyword txl_keyword contained glob-mark glob-nocheck glob-noescape glob-nomagic
+syn keyword txl_keyword contained glob-nosort glob-onlydir glob-period glob-tilde
+syn keyword txl_keyword contained glob-tilde-check greater group-by gun
+syn keyword txl_keyword contained hash hash-alist hash-construct hash-count
+syn keyword txl_keyword contained hash-diff hash-eql hash-equal hash-from-pairs
+syn keyword txl_keyword contained hash-isec hash-keys hash-list hash-pairs
+syn keyword txl_keyword contained hash-proper-subset hash-revget hash-subset hash-uni
+syn keyword txl_keyword contained hash-update hash-update-1 hash-values hashp
+syn keyword txl_keyword contained have html-decode html-encode iapply
+syn keyword txl_keyword contained identity ido if ifa
+syn keyword txl_keyword contained iff iffi iflet ignerr
+syn keyword txl_keyword contained in inc inc-indent indent-code
+syn keyword txl_keyword contained indent-data indent-off inhash int-flo
+syn keyword txl_keyword contained int-str integerp intern interp-fun-p
+syn keyword txl_keyword contained interpose ip ipf isqrt
+syn keyword txl_keyword contained itimer-prov itimer-real itimer-virtual juxt
+syn keyword txl_keyword contained keep-if keep-if* keyword-package keywordp
+syn keyword txl_keyword contained kill labels lambda last
+syn keyword txl_keyword contained lazy-str lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list
+syn keyword txl_keyword contained lazy-stream-cons lazy-stringp lcm lcons
+syn keyword txl_keyword contained lcons-fun lconsp ldiff length
+syn keyword txl_keyword contained length-list length-str length-str-< length-str-<=
+syn keyword txl_keyword contained length-str-> length-str->= length-vec lequal
+syn keyword txl_keyword contained less let let* lexical-fun-p
+syn keyword txl_keyword contained lexical-lisp1-binding lexical-var-p lib-version link
+syn keyword txl_keyword contained lisp-parse list list* list-str
+syn keyword txl_keyword contained list-vector listp load log
+syn keyword txl_keyword contained log-alert log-auth log-authpriv log-cons
+syn keyword txl_keyword contained log-crit log-daemon log-debug log-emerg
+syn keyword txl_keyword contained log-err log-info log-ndelay log-notice
+syn keyword txl_keyword contained log-nowait log-odelay log-perror log-pid
+syn keyword txl_keyword contained log-user log-warning log10 log2
+syn keyword txl_keyword contained logand logior lognot logtest
+syn keyword txl_keyword contained logtrunc logxor lstat mac-param-bind
+syn keyword txl_keyword contained macro-form-p macro-time macroexpand macroexpand-1
+syn keyword txl_keyword contained macrolet major make-catenated-stream make-env
+syn keyword txl_keyword contained make-hash make-lazy-cons make-like make-package
+syn keyword txl_keyword contained make-random-state make-similar-hash make-string-byte-input-stream make-string-input-stream
+syn keyword txl_keyword contained make-string-output-stream make-strlist-output-stream make-struct make-struct-type
+syn keyword txl_keyword contained make-sym make-time make-time-utc make-trie
+syn keyword txl_keyword contained makedev makunbound mapcar mapcar*
+syn keyword txl_keyword contained mapdo mapf maphash mappend
+syn keyword txl_keyword contained mappend* mask match-fun match-regex
+syn keyword txl_keyword contained match-regex-right match-regst match-regst-right match-str
+syn keyword txl_keyword contained match-str-tree max member member-if
+syn keyword txl_keyword contained memq memql memqual merge
+syn keyword txl_keyword contained meth method min minor
+syn keyword txl_keyword contained minusp mkdir mknod mkstring
+syn keyword txl_keyword contained mlet mod multi multi-sort
+syn keyword txl_keyword contained n-choose-k n-perm-k nconc new
+syn keyword txl_keyword contained nil nilf ninth none
+syn keyword txl_keyword contained not notf nreverse nthcdr
+syn keyword txl_keyword contained null nullify num-chr num-str
+syn keyword txl_keyword contained numberp oand oddp op
+syn keyword txl_keyword contained open-command open-directory open-file open-fileno
+syn keyword txl_keyword contained open-files open-files* open-pipe open-process
+syn keyword txl_keyword contained open-tail openlog opip or
+syn keyword txl_keyword contained orf package-alist package-name package-symbols
+syn keyword txl_keyword contained packagep pad partition partition*
+syn keyword txl_keyword contained partition-by path-blkdev-p path-chrdev-p path-dir-p
+syn keyword txl_keyword contained path-executable-to-me-p path-exists-p path-file-p path-mine-p
+syn keyword txl_keyword contained path-my-group-p path-newer path-older path-pipe-p
+syn keyword txl_keyword contained path-private-to-me-p path-same-object path-setgid-p path-setuid-p
+syn keyword txl_keyword contained path-sock-p path-sticky-p path-symlink-p path-writable-to-me-p
+syn keyword txl_keyword contained perm pipe place-form-p placelet
+syn keyword txl_keyword contained placelet* plusp poll poll-err
+syn keyword txl_keyword contained poll-in poll-nval poll-out poll-pri
+syn keyword txl_keyword contained poll-rdband poll-wrband pop pos
+syn keyword txl_keyword contained pos-if pos-max pos-min posq
+syn keyword txl_keyword contained posql posqual pppred ppred
+syn keyword txl_keyword contained pprinl pprint pprof pred
+syn keyword txl_keyword contained prinl print prof prog1
+syn keyword txl_keyword contained progn promisep prop proper-listp
+syn keyword txl_keyword contained pset push pushhash pushnew
+syn keyword txl_keyword contained put-byte put-char put-line put-lines
+syn keyword txl_keyword contained put-string put-strings pwd qquote
+syn keyword txl_keyword contained qref quote raise rand
+syn keyword txl_keyword contained random random-fixnum random-state-p range
+syn keyword txl_keyword contained range* range-regex rcomb read
+syn keyword txl_keyword contained readlink real-time-stream-p reduce-left reduce-right
+syn keyword txl_keyword contained ref refset regex-compile regex-parse
+syn keyword txl_keyword contained regexp register-exception-subtypes regsub rehome-sym
+syn keyword txl_keyword contained remhash remove-if remove-if* remove-path
+syn keyword txl_keyword contained remq remq* remql remql*
+syn keyword txl_keyword contained remqual remqual* rename-path repeat
+syn keyword txl_keyword contained replace replace-list replace-str replace-struct
+syn keyword txl_keyword contained replace-vec reset-struct rest ret
+syn keyword txl_keyword contained retf return return-from reverse
+syn keyword txl_keyword contained rlcp rlet rotate rperm
+syn keyword txl_keyword contained rplaca rplacd run s-ifblk
+syn keyword txl_keyword contained s-ifchr s-ifdir s-ififo s-iflnk
+syn keyword txl_keyword contained s-ifmt s-ifreg s-ifsock s-irgrp
+syn keyword txl_keyword contained s-iroth s-irusr s-irwxg s-irwxo
+syn keyword txl_keyword contained s-irwxu s-isgid s-isuid s-isvtx
+syn keyword txl_keyword contained s-iwgrp s-iwoth s-iwusr s-ixgrp
+syn keyword txl_keyword contained s-ixoth s-ixusr search search-regex
+syn keyword txl_keyword contained search-regst search-str search-str-tree second
+syn keyword txl_keyword contained seek-stream select self-path seqp
+syn keyword txl_keyword contained set set-diff set-hash-userdata set-indent
+syn keyword txl_keyword contained set-indent-mode set-sig-handler setegid setenv
+syn keyword txl_keyword contained seteuid setgid setgrent sethash
+syn keyword txl_keyword contained setitimer setlogmask setpwent setuid
+syn keyword txl_keyword contained seventh sh shift shuffle
+syn keyword txl_keyword contained sig-abrt sig-alrm sig-bus sig-check
+syn keyword txl_keyword contained sig-chld sig-cont sig-fpe sig-hup
+syn keyword txl_keyword contained sig-ill sig-int sig-io sig-iot
+syn keyword txl_keyword contained sig-kill sig-pipe sig-poll sig-prof
+syn keyword txl_keyword contained sig-pwr sig-quit sig-segv sig-stkflt
+syn keyword txl_keyword contained sig-stop sig-sys sig-term sig-trap
+syn keyword txl_keyword contained sig-tstp sig-ttin sig-ttou sig-urg
+syn keyword txl_keyword contained sig-usr1 sig-usr2 sig-vtalrm sig-winch
+syn keyword txl_keyword contained sig-xcpu sig-xfsz sign-extend sin
+syn keyword txl_keyword contained sixth size-vec slot slotp
+syn keyword txl_keyword contained slotset some sort sort-group
+syn keyword txl_keyword contained source-loc source-loc-str span-str special-operator-p
+syn keyword txl_keyword contained special-var-p splice split split-str
+syn keyword txl_keyword contained split-str-set sqrt sssucc ssucc
+syn keyword txl_keyword contained stat static-slot static-slot-p static-slot-set
+syn keyword txl_keyword contained stdlib str< str<= str=
+syn keyword txl_keyword contained str> str>= stream-get-prop stream-set-prop
+syn keyword txl_keyword contained streamp string-extend string-lt stringp
+syn keyword txl_keyword contained struct-type struct-type-p structp sub
+syn keyword txl_keyword contained sub-list sub-str sub-vec subtypep
+syn keyword txl_keyword contained succ super super-method swap
+syn keyword txl_keyword contained symacrolet symbol-function symbol-name symbol-package
+syn keyword txl_keyword contained symbol-value symbolp symlink sys:*lisp1*
+syn keyword txl_keyword contained sys:bad-slot-syntax sys:do-path-test sys:dwim-del sys:dwim-set
+syn keyword txl_keyword contained sys:eval-err sys:expand sys:expr sys:fbind
+syn keyword txl_keyword contained sys:gc sys:gc-set-delta sys:get-fb sys:get-vb
+syn keyword txl_keyword contained sys:l1-setq sys:l1-val sys:lbind sys:lisp1-setq
+syn keyword txl_keyword contained sys:lisp1-value sys:load sys:make-struct-type sys:mark-special
+syn keyword txl_keyword contained sys:path-access sys:path-examine sys:path-test sys:path-test-mode
+syn keyword txl_keyword contained sys:pl-expand sys:placelet-1 sys:prune-nil-inits sys:qquote
+syn keyword txl_keyword contained sys:quasi sys:quasilist sys:reg-expand-nongreedy sys:reg-optimize
+syn keyword txl_keyword contained sys:rplaca sys:rplacd sys:setq sys:setqf
+syn keyword txl_keyword contained sys:splice sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander
+syn keyword txl_keyword contained sys:sym-update-expander sys:top-fb sys:top-vb sys:trigger-load
+syn keyword txl_keyword contained sys:unquote sys:var sys:with-saved-vars syslog
+syn keyword txl_keyword contained system-package t take take-until
+syn keyword txl_keyword contained take-while tan tb tc
+syn keyword txl_keyword contained tenth test-set-indent-mode tf third
+syn keyword txl_keyword contained throw throwf time time-fields-local
+syn keyword txl_keyword contained time-fields-utc time-string-local time-string-utc time-struct-local
+syn keyword txl_keyword contained time-struct-utc time-usec tofloat toint
+syn keyword txl_keyword contained tok-str tok-where tostring tostringp
+syn keyword txl_keyword contained tprint transpose tree-bind tree-case
+syn keyword txl_keyword contained tree-find trie-add trie-compress trie-lookup-begin
+syn keyword txl_keyword contained trie-lookup-feed-char trie-value-at trim-str true
+syn keyword txl_keyword contained trunc trunc-rem tuples txr-case
+syn keyword txl_keyword contained txr-case-impl txr-if txr-version txr-when
+syn keyword txl_keyword contained typeof typep umeth umethod
+syn keyword txl_keyword contained unget-byte unget-char uniq unique
+syn keyword txl_keyword contained unless unquote unsetenv until
+syn keyword txl_keyword contained until* unwind-protect upcase-str update
+syn keyword txl_keyword contained url-decode url-encode user-package usleep
+syn keyword txl_keyword contained vec vec-push vec-set-length vecref
+syn keyword txl_keyword contained vector vector-list vectorp w-continued
+syn keyword txl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
+syn keyword txl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
+syn keyword txl_keyword contained w-termsig w-untraced wait weave
+syn keyword txl_keyword contained when whenlet where while
+syn keyword txl_keyword contained while* whilet width width-check
+syn keyword txl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-in-string-byte-stream
+syn keyword txl_keyword contained with-in-string-stream with-objects with-out-string-stream with-out-strlist-stream
+syn keyword txl_keyword contained with-resources with-stream with-update-expander wrap
+syn keyword txl_keyword contained wrap* zap zerop zip
syn match txr_nested_error "[^\t ]\+" contained
syn match txr_variable "\(@[ \t]*\)[*]\?[ \t]*[A-Za-z_][A-Za-z_0-9]*"
syn match txr_splicevar "@[ \t,*@]*[A-Za-z_][A-Za-z_0-9]*"
@@ -378,3 +384,5 @@ hi def link txr_error Error
hi def link txr_nested_error Error
let b:current_syntax = "lisp"
+
+set lispwords=ado,ap,append-each,append-each*,aret,block,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,dec,defex,define-modify-macro,define-place-macro,defmacro,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,gun,ido,if,ifa,iflet,ignerr,ip,labels,lambda,lcons,let,let*,load,mac-param-bind,macro-time,macrolet,meth,mlet,new,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,symacrolet,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:unquote,sys:var,sys:with-saved-vars,tb,tc,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,umeth,unless,unquote,until,until*,unwind-protect,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-stream,with-update-expander,zap,:method,:function,:init,:fini
diff --git a/txr.1 b/txr.1
index c7321f75..09220df0 100644
--- a/txr.1
+++ b/txr.1
@@ -344,9 +344,9 @@
.ds TX \f[B]TXR\f[]
.ds TL \f[B]TXR Lisp\f[]
.\" Start of man page:
-.TH TXR 1 2015-10-01 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2015-10-10 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
.SH* NAME
-\*(TX \- text processing language (version 118)
+\*(TX \- text processing language (version 119)
.SH* SYNOPSIS
.cblk
.meti txr >> [ options ] < query-file < data-files ..
diff --git a/txr.vim b/txr.vim
index 40ff1ee7..884bef37 100644
--- a/txr.vim
+++ b/txr.vim
@@ -68,43 +68,45 @@ syn keyword txl_keyword contained cadaar cadadar cadaddr cadadr
syn keyword txl_keyword contained cadar caddaar caddadr caddar
syn keyword txl_keyword contained cadddar caddddr cadddr caddr
syn keyword txl_keyword contained cadr call call-clobber-expander call-delete-expander
-syn keyword txl_keyword contained call-super-fun call-super-method call-update-expander callf
-syn keyword txl_keyword contained car caseq caseql casequal
-syn keyword txl_keyword contained cat-str cat-streams cat-vec catch
-syn keyword txl_keyword contained catenated-stream-p catenated-stream-push cdaaaar cdaaadr
-syn keyword txl_keyword contained cdaaar cdaadar cdaaddr cdaadr
-syn keyword txl_keyword contained cdaar cdadaar cdadadr cdadar
-syn keyword txl_keyword contained cdaddar cdadddr cdaddr cdadr
-syn keyword txl_keyword contained cdar cddaaar cddaadr cddaar
-syn keyword txl_keyword contained cddadar cddaddr cddadr cddar
-syn keyword txl_keyword contained cdddaar cdddadr cdddar cddddar
-syn keyword txl_keyword contained cdddddr cddddr cdddr cddr
-syn keyword txl_keyword contained cdr ceil chain chand
-syn keyword txl_keyword contained chdir chmod chr-isalnum chr-isalpha
-syn keyword txl_keyword contained chr-isascii chr-isblank chr-iscntrl chr-isdigit
-syn keyword txl_keyword contained chr-isgraph chr-islower chr-isprint chr-ispunct
-syn keyword txl_keyword contained chr-isspace chr-isunisp chr-isupper chr-isxdigit
-syn keyword txl_keyword contained chr-num chr-str chr-str-set chr-tolower
-syn keyword txl_keyword contained chr-toupper chrp clamp clear-error
-syn keyword txl_keyword contained close-stream closelog cmp-str collect-each
-syn keyword txl_keyword contained collect-each* comb compl-span-str cond
-syn keyword txl_keyword contained conda cons conses conses*
-syn keyword txl_keyword contained consp constantp copy copy-alist
-syn keyword txl_keyword contained copy-cons copy-hash copy-list copy-str
-syn keyword txl_keyword contained copy-struct copy-vec cos count-if
-syn keyword txl_keyword contained countq countql countqual cum-norm-dist
-syn keyword txl_keyword contained daemon dec define-modify-macro define-place-macro
-syn keyword txl_keyword contained defmacro defparm defparml defplace
-syn keyword txl_keyword contained defstruct defsymacro defun defvar
-syn keyword txl_keyword contained defvarl del delay delete-package
-syn keyword txl_keyword contained display-width do dohash dotimes
-syn keyword txl_keyword contained downcase-str dup dupfd dwim
-syn keyword txl_keyword contained each each* eighth empty
-syn keyword txl_keyword contained endgrent endpwent ensure-dir env
-syn keyword txl_keyword contained env-fbind env-hash env-vbind eq
-syn keyword txl_keyword contained eql equal errno error
-syn keyword txl_keyword contained eval evenp exec exit
-syn keyword txl_keyword contained exit* exp expt exptmod
+syn keyword txl_keyword contained call-finalizers call-super-fun call-super-method call-update-expander
+syn keyword txl_keyword contained callf car caseq caseql
+syn keyword txl_keyword contained casequal cat-str cat-streams cat-vec
+syn keyword txl_keyword contained catch catenated-stream-p catenated-stream-push cdaaaar
+syn keyword txl_keyword contained cdaaadr cdaaar cdaadar cdaaddr
+syn keyword txl_keyword contained cdaadr cdaar cdadaar cdadadr
+syn keyword txl_keyword contained cdadar cdaddar cdadddr cdaddr
+syn keyword txl_keyword contained cdadr cdar cddaaar cddaadr
+syn keyword txl_keyword contained cddaar cddadar cddaddr cddadr
+syn keyword txl_keyword contained cddar cdddaar cdddadr cdddar
+syn keyword txl_keyword contained cddddar cdddddr cddddr cdddr
+syn keyword txl_keyword contained cddr cdr ceil chain
+syn keyword txl_keyword contained chand chdir chmod chr-isalnum
+syn keyword txl_keyword contained chr-isalpha chr-isascii chr-isblank chr-iscntrl
+syn keyword txl_keyword contained chr-isdigit chr-isgraph chr-islower chr-isprint
+syn keyword txl_keyword contained chr-ispunct chr-isspace chr-isunisp chr-isupper
+syn keyword txl_keyword contained chr-isxdigit chr-num chr-str chr-str-set
+syn keyword txl_keyword contained chr-tolower chr-toupper chrp clamp
+syn keyword txl_keyword contained clear-error clear-struct close-stream closelog
+syn keyword txl_keyword contained cmp-str collect-each collect-each* comb
+syn keyword txl_keyword contained compl-span-str cond conda cons
+syn keyword txl_keyword contained conses conses* consp constantp
+syn keyword txl_keyword contained copy copy-alist copy-cons copy-hash
+syn keyword txl_keyword contained copy-list copy-str copy-struct copy-vec
+syn keyword txl_keyword contained cos count-if countq countql
+syn keyword txl_keyword contained countqual cum-norm-dist daemon dec
+syn keyword txl_keyword contained defex define-modify-macro define-place-macro defmacro
+syn keyword txl_keyword contained defparm defparml defplace defstruct
+syn keyword txl_keyword contained defsymacro defun defvar defvarl
+syn keyword txl_keyword contained del delay delete-package display-width
+syn keyword txl_keyword contained do dohash dotimes downcase-str
+syn keyword txl_keyword contained drop drop-until drop-while dup
+syn keyword txl_keyword contained dupfd dwim each each*
+syn keyword txl_keyword contained eighth empty endgrent endpwent
+syn keyword txl_keyword contained ensure-dir env env-fbind env-hash
+syn keyword txl_keyword contained env-vbind eq eql equal
+syn keyword txl_keyword contained errno error eval evenp
+syn keyword txl_keyword contained exception-subtype-p exec exit exit*
+syn keyword txl_keyword contained exp expand-right expt exptmod
syn keyword txl_keyword contained false fboundp fifth fileno
syn keyword txl_keyword contained filter-equal filter-string-tree finalize find
syn keyword txl_keyword contained find-if find-max find-min find-package
@@ -125,170 +127,174 @@ syn keyword txl_keyword contained get-string-from-stream get-update-expander get
syn keyword txl_keyword contained geteuid getgid getgrent getgrgid
syn keyword txl_keyword contained getgrnam getgroups gethash getitimer
syn keyword txl_keyword contained getpid getppid getpwent getpwnam
-syn keyword txl_keyword contained getpwuid getuid giterate glob
-syn keyword txl_keyword contained glob-altdirfunc glob-brace glob-err glob-mark
-syn keyword txl_keyword contained glob-nocheck glob-noescape glob-nomagic glob-nosort
-syn keyword txl_keyword contained glob-onlydir glob-period glob-tilde glob-tilde-check
-syn keyword txl_keyword contained greater group-by gun hash
-syn keyword txl_keyword contained hash-alist hash-construct hash-count hash-diff
-syn keyword txl_keyword contained hash-eql hash-equal hash-from-pairs hash-isec
-syn keyword txl_keyword contained hash-keys hash-list hash-pairs hash-proper-subset
-syn keyword txl_keyword contained hash-revget hash-subset hash-uni hash-update
-syn keyword txl_keyword contained hash-update-1 hash-values hashp have
-syn keyword txl_keyword contained html-decode html-encode iapply identity
-syn keyword txl_keyword contained ido if ifa iff
-syn keyword txl_keyword contained iffi iflet ignerr in
-syn keyword txl_keyword contained inc inc-indent indent-code indent-data
-syn keyword txl_keyword contained indent-off inhash int-flo int-str
-syn keyword txl_keyword contained integerp intern interp-fun-p interpose
-syn keyword txl_keyword contained ip ipf isqrt itimer-prov
-syn keyword txl_keyword contained itimer-real itimer-virtual juxt keep-if
-syn keyword txl_keyword contained keep-if* keyword-package keywordp kill
-syn keyword txl_keyword contained labels lambda last lazy-str
-syn keyword txl_keyword contained lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons
-syn keyword txl_keyword contained lazy-stringp lcm lcons lcons-fun
-syn keyword txl_keyword contained lconsp ldiff length length-list
-syn keyword txl_keyword contained length-str length-str-< length-str-<= length-str->
-syn keyword txl_keyword contained length-str->= length-vec lequal less
-syn keyword txl_keyword contained let let* lexical-fun-p lexical-lisp1-binding
-syn keyword txl_keyword contained lexical-var-p lib-version link lisp-parse
-syn keyword txl_keyword contained list list* list-str list-vector
-syn keyword txl_keyword contained listp load log log-alert
-syn keyword txl_keyword contained log-auth log-authpriv log-cons log-crit
-syn keyword txl_keyword contained log-daemon log-debug log-emerg log-err
-syn keyword txl_keyword contained log-info log-ndelay log-notice log-nowait
-syn keyword txl_keyword contained log-odelay log-perror log-pid log-user
-syn keyword txl_keyword contained log-warning log10 log2 logand
-syn keyword txl_keyword contained logior lognot logtest logtrunc
-syn keyword txl_keyword contained logxor lstat mac-param-bind macro-form-p
-syn keyword txl_keyword contained macro-time macroexpand macroexpand-1 macrolet
-syn keyword txl_keyword contained major make-catenated-stream make-env make-hash
-syn keyword txl_keyword contained make-lazy-cons make-like make-package make-random-state
-syn keyword txl_keyword contained make-similar-hash make-string-byte-input-stream make-string-input-stream make-string-output-stream
-syn keyword txl_keyword contained make-strlist-output-stream make-struct make-struct-type make-sym
-syn keyword txl_keyword contained make-time make-time-utc make-trie makedev
-syn keyword txl_keyword contained makunbound mapcar mapcar* mapdo
-syn keyword txl_keyword contained mapf maphash mappend mappend*
-syn keyword txl_keyword contained mask match-fun match-regex match-regex-right
-syn keyword txl_keyword contained match-regst match-regst-right match-str match-str-tree
-syn keyword txl_keyword contained max member member-if memq
-syn keyword txl_keyword contained memql memqual merge meth
-syn keyword txl_keyword contained method min minor minusp
-syn keyword txl_keyword contained mkdir mknod mkstring mlet
-syn keyword txl_keyword contained mod multi multi-sort n-choose-k
-syn keyword txl_keyword contained n-perm-k nconc new nil
-syn keyword txl_keyword contained nilf ninth none not
-syn keyword txl_keyword contained notf nreverse nthcdr null
-syn keyword txl_keyword contained nullify num-chr num-str numberp
-syn keyword txl_keyword contained oand oddp op open-command
-syn keyword txl_keyword contained open-directory open-file open-fileno open-files
-syn keyword txl_keyword contained open-files* open-pipe open-process open-tail
-syn keyword txl_keyword contained openlog opip or orf
-syn keyword txl_keyword contained package-alist package-name package-symbols packagep
-syn keyword txl_keyword contained pad partition partition* partition-by
-syn keyword txl_keyword contained path-blkdev-p path-chrdev-p path-dir-p path-executable-to-me-p
-syn keyword txl_keyword contained path-exists-p path-file-p path-mine-p path-my-group-p
-syn keyword txl_keyword contained path-newer path-older path-pipe-p path-private-to-me-p
-syn keyword txl_keyword contained path-same-object path-setgid-p path-setuid-p path-sock-p
-syn keyword txl_keyword contained path-sticky-p path-symlink-p path-writable-to-me-p perm
-syn keyword txl_keyword contained pipe place-form-p placelet placelet*
-syn keyword txl_keyword contained plusp poll poll-err poll-in
-syn keyword txl_keyword contained poll-nval poll-out poll-pri poll-rdband
-syn keyword txl_keyword contained poll-wrband pop pos pos-if
-syn keyword txl_keyword contained pos-max pos-min posq posql
-syn keyword txl_keyword contained posqual pppred ppred pprinl
-syn keyword txl_keyword contained pprint pprof pred prinl
-syn keyword txl_keyword contained print prof prog1 progn
-syn keyword txl_keyword contained prop proper-listp pset push
-syn keyword txl_keyword contained pushhash pushnew put-byte put-char
-syn keyword txl_keyword contained put-line put-lines put-string put-strings
-syn keyword txl_keyword contained pwd qquote qref quote
-syn keyword txl_keyword contained raise rand random random-fixnum
-syn keyword txl_keyword contained random-state-p range range* range-regex
-syn keyword txl_keyword contained rcomb read readlink real-time-stream-p
-syn keyword txl_keyword contained reduce-left reduce-right ref refset
-syn keyword txl_keyword contained regex-compile regex-parse regexp regsub
-syn keyword txl_keyword contained rehome-sym remhash remove-if remove-if*
-syn keyword txl_keyword contained remove-path remq remq* remql
-syn keyword txl_keyword contained remql* remqual remqual* rename-path
-syn keyword txl_keyword contained repeat replace replace-list replace-str
-syn keyword txl_keyword contained replace-vec rest ret retf
-syn keyword txl_keyword contained return return-from reverse rlcp
-syn keyword txl_keyword contained rlet rotate rperm rplaca
-syn keyword txl_keyword contained rplacd run s-ifblk s-ifchr
-syn keyword txl_keyword contained s-ifdir s-ififo s-iflnk s-ifmt
-syn keyword txl_keyword contained s-ifreg s-ifsock s-irgrp s-iroth
-syn keyword txl_keyword contained s-irusr s-irwxg s-irwxo s-irwxu
-syn keyword txl_keyword contained s-isgid s-isuid s-isvtx s-iwgrp
-syn keyword txl_keyword contained s-iwoth s-iwusr s-ixgrp s-ixoth
-syn keyword txl_keyword contained s-ixusr search search-regex search-regst
-syn keyword txl_keyword contained search-str search-str-tree second seek-stream
-syn keyword txl_keyword contained select self-path seqp set
-syn keyword txl_keyword contained set-diff set-hash-userdata set-indent set-indent-mode
-syn keyword txl_keyword contained set-sig-handler setegid setenv seteuid
-syn keyword txl_keyword contained setgid setgrent sethash setitimer
-syn keyword txl_keyword contained setlogmask setpwent setuid seventh
-syn keyword txl_keyword contained sh shift shuffle sig-abrt
-syn keyword txl_keyword contained sig-alrm sig-bus sig-check sig-chld
-syn keyword txl_keyword contained sig-cont sig-fpe sig-hup sig-ill
-syn keyword txl_keyword contained sig-int sig-io sig-iot sig-kill
-syn keyword txl_keyword contained sig-pipe sig-poll sig-prof sig-pwr
-syn keyword txl_keyword contained sig-quit sig-segv sig-stkflt sig-stop
-syn keyword txl_keyword contained sig-sys sig-term sig-trap sig-tstp
-syn keyword txl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
-syn keyword txl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
-syn keyword txl_keyword contained sig-xfsz sign-extend sin sixth
-syn keyword txl_keyword contained size-vec slot slot-p slotset
-syn keyword txl_keyword contained some sort sort-group source-loc
-syn keyword txl_keyword contained source-loc-str span-str special-operator-p special-var-p
-syn keyword txl_keyword contained splice split split-str split-str-set
-syn keyword txl_keyword contained sqrt sssucc ssucc stat
-syn keyword txl_keyword contained static-slot static-slot-p static-slot-set stdlib
-syn keyword txl_keyword contained str< str<= str= str>
-syn keyword txl_keyword contained str>= stream-get-prop stream-set-prop streamp
-syn keyword txl_keyword contained string-extend string-lt stringp struct-type
-syn keyword txl_keyword contained struct-type-p structp sub sub-list
-syn keyword txl_keyword contained sub-str sub-vec subtypep succ
-syn keyword txl_keyword contained super super-method swap symacrolet
-syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
-syn keyword txl_keyword contained symbolp symlink sys:*lisp1* sys:bad-slot-syntax
-syn keyword txl_keyword contained sys:do-path-test sys:dwim-del sys:dwim-set sys:eval-err
-syn keyword txl_keyword contained sys:expand sys:expr sys:fbind sys:gc
-syn keyword txl_keyword contained sys:gc-set-delta sys:get-fb sys:get-vb sys:l1-setq
-syn keyword txl_keyword contained sys:l1-val sys:lbind sys:lisp1-setq sys:lisp1-value
-syn keyword txl_keyword contained sys:load sys:make-struct-type sys:mark-special sys:path-access
-syn keyword txl_keyword contained sys:path-examine sys:path-test sys:path-test-mode sys:pl-expand
-syn keyword txl_keyword contained sys:placelet-1 sys:qquote sys:quasi sys:quasilist
-syn keyword txl_keyword contained sys:reg-expand-nongreedy sys:reg-optimize sys:rplaca sys:rplacd
-syn keyword txl_keyword contained sys:setq sys:setqf sys:splice sys:struct-lit
-syn keyword txl_keyword contained sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander sys:top-fb
-syn keyword txl_keyword contained sys:top-vb sys:trigger-load sys:unquote sys:var
-syn keyword txl_keyword contained sys:with-saved-vars syslog system-package t
-syn keyword txl_keyword contained tan tb tc tenth
-syn keyword txl_keyword contained test-set-indent-mode tf third throw
-syn keyword txl_keyword contained throwf time time-fields-local time-fields-utc
-syn keyword txl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
-syn keyword txl_keyword contained time-usec tofloat toint tok-str
-syn keyword txl_keyword contained tok-where tostring tostringp tprint
-syn keyword txl_keyword contained transpose tree-bind tree-case tree-find
-syn keyword txl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
-syn keyword txl_keyword contained trie-value-at trim-str true trunc
-syn keyword txl_keyword contained trunc-rem tuples txr-case txr-case-impl
-syn keyword txl_keyword contained txr-if txr-version txr-when typeof
-syn keyword txl_keyword contained typep unget-byte unget-char uniq
-syn keyword txl_keyword contained unique unless unquote unsetenv
-syn keyword txl_keyword contained until until* unwind-protect upcase-str
-syn keyword txl_keyword contained update url-decode url-encode user-package
-syn keyword txl_keyword contained usleep vec vec-push vec-set-length
-syn keyword txl_keyword contained vecref vector vector-list vectorp
-syn keyword txl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
-syn keyword txl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
-syn keyword txl_keyword contained w-stopsig w-termsig w-untraced wait
-syn keyword txl_keyword contained weave when whenlet where
-syn keyword txl_keyword contained while while* whilet width
-syn keyword txl_keyword contained width-check with-clobber-expander with-delete-expander with-gensyms
-syn keyword txl_keyword contained with-resources with-update-expander wrap wrap*
-syn keyword txl_keyword contained zap zerop zip
+syn keyword txl_keyword contained getpwuid getuid ginterate giterate
+syn keyword txl_keyword contained glob glob-altdirfunc glob-brace glob-err
+syn keyword txl_keyword contained glob-mark glob-nocheck glob-noescape glob-nomagic
+syn keyword txl_keyword contained glob-nosort glob-onlydir glob-period glob-tilde
+syn keyword txl_keyword contained glob-tilde-check greater group-by gun
+syn keyword txl_keyword contained hash hash-alist hash-construct hash-count
+syn keyword txl_keyword contained hash-diff hash-eql hash-equal hash-from-pairs
+syn keyword txl_keyword contained hash-isec hash-keys hash-list hash-pairs
+syn keyword txl_keyword contained hash-proper-subset hash-revget hash-subset hash-uni
+syn keyword txl_keyword contained hash-update hash-update-1 hash-values hashp
+syn keyword txl_keyword contained have html-decode html-encode iapply
+syn keyword txl_keyword contained identity ido if ifa
+syn keyword txl_keyword contained iff iffi iflet ignerr
+syn keyword txl_keyword contained in inc inc-indent indent-code
+syn keyword txl_keyword contained indent-data indent-off inhash int-flo
+syn keyword txl_keyword contained int-str integerp intern interp-fun-p
+syn keyword txl_keyword contained interpose ip ipf isqrt
+syn keyword txl_keyword contained itimer-prov itimer-real itimer-virtual juxt
+syn keyword txl_keyword contained keep-if keep-if* keyword-package keywordp
+syn keyword txl_keyword contained kill labels lambda last
+syn keyword txl_keyword contained lazy-str lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list
+syn keyword txl_keyword contained lazy-stream-cons lazy-stringp lcm lcons
+syn keyword txl_keyword contained lcons-fun lconsp ldiff length
+syn keyword txl_keyword contained length-list length-str length-str-< length-str-<=
+syn keyword txl_keyword contained length-str-> length-str->= length-vec lequal
+syn keyword txl_keyword contained less let let* lexical-fun-p
+syn keyword txl_keyword contained lexical-lisp1-binding lexical-var-p lib-version link
+syn keyword txl_keyword contained lisp-parse list list* list-str
+syn keyword txl_keyword contained list-vector listp load log
+syn keyword txl_keyword contained log-alert log-auth log-authpriv log-cons
+syn keyword txl_keyword contained log-crit log-daemon log-debug log-emerg
+syn keyword txl_keyword contained log-err log-info log-ndelay log-notice
+syn keyword txl_keyword contained log-nowait log-odelay log-perror log-pid
+syn keyword txl_keyword contained log-user log-warning log10 log2
+syn keyword txl_keyword contained logand logior lognot logtest
+syn keyword txl_keyword contained logtrunc logxor lstat mac-param-bind
+syn keyword txl_keyword contained macro-form-p macro-time macroexpand macroexpand-1
+syn keyword txl_keyword contained macrolet major make-catenated-stream make-env
+syn keyword txl_keyword contained make-hash make-lazy-cons make-like make-package
+syn keyword txl_keyword contained make-random-state make-similar-hash make-string-byte-input-stream make-string-input-stream
+syn keyword txl_keyword contained make-string-output-stream make-strlist-output-stream make-struct make-struct-type
+syn keyword txl_keyword contained make-sym make-time make-time-utc make-trie
+syn keyword txl_keyword contained makedev makunbound mapcar mapcar*
+syn keyword txl_keyword contained mapdo mapf maphash mappend
+syn keyword txl_keyword contained mappend* mask match-fun match-regex
+syn keyword txl_keyword contained match-regex-right match-regst match-regst-right match-str
+syn keyword txl_keyword contained match-str-tree max member member-if
+syn keyword txl_keyword contained memq memql memqual merge
+syn keyword txl_keyword contained meth method min minor
+syn keyword txl_keyword contained minusp mkdir mknod mkstring
+syn keyword txl_keyword contained mlet mod multi multi-sort
+syn keyword txl_keyword contained n-choose-k n-perm-k nconc new
+syn keyword txl_keyword contained nil nilf ninth none
+syn keyword txl_keyword contained not notf nreverse nthcdr
+syn keyword txl_keyword contained null nullify num-chr num-str
+syn keyword txl_keyword contained numberp oand oddp op
+syn keyword txl_keyword contained open-command open-directory open-file open-fileno
+syn keyword txl_keyword contained open-files open-files* open-pipe open-process
+syn keyword txl_keyword contained open-tail openlog opip or
+syn keyword txl_keyword contained orf package-alist package-name package-symbols
+syn keyword txl_keyword contained packagep pad partition partition*
+syn keyword txl_keyword contained partition-by path-blkdev-p path-chrdev-p path-dir-p
+syn keyword txl_keyword contained path-executable-to-me-p path-exists-p path-file-p path-mine-p
+syn keyword txl_keyword contained path-my-group-p path-newer path-older path-pipe-p
+syn keyword txl_keyword contained path-private-to-me-p path-same-object path-setgid-p path-setuid-p
+syn keyword txl_keyword contained path-sock-p path-sticky-p path-symlink-p path-writable-to-me-p
+syn keyword txl_keyword contained perm pipe place-form-p placelet
+syn keyword txl_keyword contained placelet* plusp poll poll-err
+syn keyword txl_keyword contained poll-in poll-nval poll-out poll-pri
+syn keyword txl_keyword contained poll-rdband poll-wrband pop pos
+syn keyword txl_keyword contained pos-if pos-max pos-min posq
+syn keyword txl_keyword contained posql posqual pppred ppred
+syn keyword txl_keyword contained pprinl pprint pprof pred
+syn keyword txl_keyword contained prinl print prof prog1
+syn keyword txl_keyword contained progn promisep prop proper-listp
+syn keyword txl_keyword contained pset push pushhash pushnew
+syn keyword txl_keyword contained put-byte put-char put-line put-lines
+syn keyword txl_keyword contained put-string put-strings pwd qquote
+syn keyword txl_keyword contained qref quote raise rand
+syn keyword txl_keyword contained random random-fixnum random-state-p range
+syn keyword txl_keyword contained range* range-regex rcomb read
+syn keyword txl_keyword contained readlink real-time-stream-p reduce-left reduce-right
+syn keyword txl_keyword contained ref refset regex-compile regex-parse
+syn keyword txl_keyword contained regexp register-exception-subtypes regsub rehome-sym
+syn keyword txl_keyword contained remhash remove-if remove-if* remove-path
+syn keyword txl_keyword contained remq remq* remql remql*
+syn keyword txl_keyword contained remqual remqual* rename-path repeat
+syn keyword txl_keyword contained replace replace-list replace-str replace-struct
+syn keyword txl_keyword contained replace-vec reset-struct rest ret
+syn keyword txl_keyword contained retf return return-from reverse
+syn keyword txl_keyword contained rlcp rlet rotate rperm
+syn keyword txl_keyword contained rplaca rplacd run s-ifblk
+syn keyword txl_keyword contained s-ifchr s-ifdir s-ififo s-iflnk
+syn keyword txl_keyword contained s-ifmt s-ifreg s-ifsock s-irgrp
+syn keyword txl_keyword contained s-iroth s-irusr s-irwxg s-irwxo
+syn keyword txl_keyword contained s-irwxu s-isgid s-isuid s-isvtx
+syn keyword txl_keyword contained s-iwgrp s-iwoth s-iwusr s-ixgrp
+syn keyword txl_keyword contained s-ixoth s-ixusr search search-regex
+syn keyword txl_keyword contained search-regst search-str search-str-tree second
+syn keyword txl_keyword contained seek-stream select self-path seqp
+syn keyword txl_keyword contained set set-diff set-hash-userdata set-indent
+syn keyword txl_keyword contained set-indent-mode set-sig-handler setegid setenv
+syn keyword txl_keyword contained seteuid setgid setgrent sethash
+syn keyword txl_keyword contained setitimer setlogmask setpwent setuid
+syn keyword txl_keyword contained seventh sh shift shuffle
+syn keyword txl_keyword contained sig-abrt sig-alrm sig-bus sig-check
+syn keyword txl_keyword contained sig-chld sig-cont sig-fpe sig-hup
+syn keyword txl_keyword contained sig-ill sig-int sig-io sig-iot
+syn keyword txl_keyword contained sig-kill sig-pipe sig-poll sig-prof
+syn keyword txl_keyword contained sig-pwr sig-quit sig-segv sig-stkflt
+syn keyword txl_keyword contained sig-stop sig-sys sig-term sig-trap
+syn keyword txl_keyword contained sig-tstp sig-ttin sig-ttou sig-urg
+syn keyword txl_keyword contained sig-usr1 sig-usr2 sig-vtalrm sig-winch
+syn keyword txl_keyword contained sig-xcpu sig-xfsz sign-extend sin
+syn keyword txl_keyword contained sixth size-vec slot slotp
+syn keyword txl_keyword contained slotset some sort sort-group
+syn keyword txl_keyword contained source-loc source-loc-str span-str special-operator-p
+syn keyword txl_keyword contained special-var-p splice split split-str
+syn keyword txl_keyword contained split-str-set sqrt sssucc ssucc
+syn keyword txl_keyword contained stat static-slot static-slot-p static-slot-set
+syn keyword txl_keyword contained stdlib str< str<= str=
+syn keyword txl_keyword contained str> str>= stream-get-prop stream-set-prop
+syn keyword txl_keyword contained streamp string-extend string-lt stringp
+syn keyword txl_keyword contained struct-type struct-type-p structp sub
+syn keyword txl_keyword contained sub-list sub-str sub-vec subtypep
+syn keyword txl_keyword contained succ super super-method swap
+syn keyword txl_keyword contained symacrolet symbol-function symbol-name symbol-package
+syn keyword txl_keyword contained symbol-value symbolp symlink sys:*lisp1*
+syn keyword txl_keyword contained sys:bad-slot-syntax sys:do-path-test sys:dwim-del sys:dwim-set
+syn keyword txl_keyword contained sys:eval-err sys:expand sys:expr sys:fbind
+syn keyword txl_keyword contained sys:gc sys:gc-set-delta sys:get-fb sys:get-vb
+syn keyword txl_keyword contained sys:l1-setq sys:l1-val sys:lbind sys:lisp1-setq
+syn keyword txl_keyword contained sys:lisp1-value sys:load sys:make-struct-type sys:mark-special
+syn keyword txl_keyword contained sys:path-access sys:path-examine sys:path-test sys:path-test-mode
+syn keyword txl_keyword contained sys:pl-expand sys:placelet-1 sys:prune-nil-inits sys:qquote
+syn keyword txl_keyword contained sys:quasi sys:quasilist sys:reg-expand-nongreedy sys:reg-optimize
+syn keyword txl_keyword contained sys:rplaca sys:rplacd sys:setq sys:setqf
+syn keyword txl_keyword contained sys:splice sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander
+syn keyword txl_keyword contained sys:sym-update-expander sys:top-fb sys:top-vb sys:trigger-load
+syn keyword txl_keyword contained sys:unquote sys:var sys:with-saved-vars syslog
+syn keyword txl_keyword contained system-package t take take-until
+syn keyword txl_keyword contained take-while tan tb tc
+syn keyword txl_keyword contained tenth test-set-indent-mode tf third
+syn keyword txl_keyword contained throw throwf time time-fields-local
+syn keyword txl_keyword contained time-fields-utc time-string-local time-string-utc time-struct-local
+syn keyword txl_keyword contained time-struct-utc time-usec tofloat toint
+syn keyword txl_keyword contained tok-str tok-where tostring tostringp
+syn keyword txl_keyword contained tprint transpose tree-bind tree-case
+syn keyword txl_keyword contained tree-find trie-add trie-compress trie-lookup-begin
+syn keyword txl_keyword contained trie-lookup-feed-char trie-value-at trim-str true
+syn keyword txl_keyword contained trunc trunc-rem tuples txr-case
+syn keyword txl_keyword contained txr-case-impl txr-if txr-version txr-when
+syn keyword txl_keyword contained typeof typep umeth umethod
+syn keyword txl_keyword contained unget-byte unget-char uniq unique
+syn keyword txl_keyword contained unless unquote unsetenv until
+syn keyword txl_keyword contained until* unwind-protect upcase-str update
+syn keyword txl_keyword contained url-decode url-encode user-package usleep
+syn keyword txl_keyword contained vec vec-push vec-set-length vecref
+syn keyword txl_keyword contained vector vector-list vectorp w-continued
+syn keyword txl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
+syn keyword txl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
+syn keyword txl_keyword contained w-termsig w-untraced wait weave
+syn keyword txl_keyword contained when whenlet where while
+syn keyword txl_keyword contained while* whilet width width-check
+syn keyword txl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-in-string-byte-stream
+syn keyword txl_keyword contained with-in-string-stream with-objects with-out-string-stream with-out-strlist-stream
+syn keyword txl_keyword contained with-resources with-stream with-update-expander wrap
+syn keyword txl_keyword contained wrap* zap zerop zip
syn keyword txr_keyword contained accept all and assert
syn keyword txr_keyword contained bind block cases cat
@@ -404,3 +410,5 @@ hi def link txr_error Error
hi def link txr_nested_error Error
let b:current_syntax = "lisp"
+
+set lispwords=ado,ap,append-each,append-each*,aret,block,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,dec,defex,define-modify-macro,define-place-macro,defmacro,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,gun,ido,if,ifa,iflet,ignerr,ip,labels,lambda,lcons,let,let*,load,mac-param-bind,macro-time,macrolet,meth,mlet,new,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,symacrolet,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:unquote,sys:var,sys:with-saved-vars,tb,tc,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,umeth,unless,unquote,until,until*,unwind-protect,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-stream,with-update-expander,zap,:method,:function,:init,:fini