* eval.c (ap_s, ret_s, aret_s): New symbol variables.

(me_ret): Static function renamed to me_ret_aret.
Handles ret and aret macro expansion.
(eval_init): Initialize ap_s, ret_s and aret_s.
Re-register ret macro using ret_s and bind to me_ret_aret.
Register aret macro.

* txr.1: Documented aret.

* tl.vim, txr.vim: Regenerated.

1 files changed, 152 insertions, 152 deletions

diff --git a/tl.vim b/tl.vim
index eec18127..6a7775e3 100644
--- a/tl.vim
+++ b/tl.vim
@@ -32,158 +32,158 @@ syn keyword txl_keyword contained acons acons-new aconsql-new acos
 syn keyword txl_keyword contained ado alist-nremove alist-remove all
 syn keyword txl_keyword contained and andf ap apf
 syn keyword txl_keyword contained append append* append-each append-each*
-syn keyword txl_keyword contained apply ash asin assoc
-syn keyword txl_keyword contained assql atan atan2 atom
-syn keyword txl_keyword contained bignump bit block boundp
-syn keyword txl_keyword contained break-str call car caseq
-syn keyword txl_keyword contained caseql casequal cat-str cat-vec
-syn keyword txl_keyword contained catch cdr ceil chain
-syn keyword txl_keyword contained chand chdir 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 close-stream closelog
-syn keyword txl_keyword contained cmp-str collect-each collect-each* comb
-syn keyword txl_keyword contained compl-span-str cond cons conses
-syn keyword txl_keyword contained conses* consp copy copy-alist
-syn keyword txl_keyword contained copy-cons copy-hash copy-list copy-str
-syn keyword txl_keyword contained copy-vec cos count-if countq
-syn keyword txl_keyword contained countql countqual cum-norm-dist daemon
-syn keyword txl_keyword contained dec defmacro defsymacro defun
-syn keyword txl_keyword contained defvar del delay delete-package
-syn keyword txl_keyword contained do dohash downcase-str dwim
-syn keyword txl_keyword contained each each* empty 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 exit exp
-syn keyword txl_keyword contained expt exptmod false fbind
-syn keyword txl_keyword contained fboundp fifth filter-equal filter-string-tree
-syn keyword txl_keyword contained finalize find find-if find-max
-syn keyword txl_keyword contained find-min find-package first fixnump
-syn keyword txl_keyword contained flatten flatten* flet flip
-syn keyword txl_keyword contained flo-int flo-str floatp floor
-syn keyword txl_keyword contained flush-stream for for* force
-syn keyword txl_keyword contained format fourth fun func-get-env
-syn keyword txl_keyword contained func-get-form func-set-env functionp gcd
-syn keyword txl_keyword contained gen generate gensym gequal
-syn keyword txl_keyword contained get-byte get-char get-hash-userdata get-line
-syn keyword txl_keyword contained get-lines get-list-from-stream get-sig-handler get-string
-syn keyword txl_keyword contained get-string-from-stream gethash getitimer getpid
-syn keyword txl_keyword contained getppid giterate greater group-by
-syn keyword txl_keyword contained gun hash hash-alist hash-construct
-syn keyword txl_keyword contained hash-count hash-diff hash-eql hash-equal
-syn keyword txl_keyword contained hash-isec hash-keys hash-pairs hash-uni
-syn keyword txl_keyword contained hash-update hash-update-1 hash-values hashp
-syn keyword txl_keyword contained html-decode html-encode iapply identity
-syn keyword txl_keyword contained ido if iff iffi
-syn keyword txl_keyword contained in inc 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* 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 lbind lcm 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* link lisp-parse
-syn keyword txl_keyword contained list list* list-str list-vector
-syn keyword txl_keyword contained listp log log-alert log-auth
-syn keyword txl_keyword contained log-authpriv log-cons log-crit log-daemon
-syn keyword txl_keyword contained log-debug log-emerg log-err log-info
-syn keyword txl_keyword contained log-ndelay log-notice log-nowait log-odelay
-syn keyword txl_keyword contained log-perror log-pid log-user log-warning
-syn keyword txl_keyword contained log10 log2 logand logior
-syn keyword txl_keyword contained lognot logtest logtrunc logxor
-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-sym make-time
-syn keyword txl_keyword contained make-time-utc make-trie makedev mapcar
-syn keyword txl_keyword contained mapcar* mapdo maphash mappend
-syn keyword txl_keyword contained mappend* mask match-fun match-regex
-syn keyword txl_keyword contained match-regex-right match-str match-str-tree max
-syn keyword txl_keyword contained member member-if memq memql
-syn keyword txl_keyword contained memqual merge min minor
-syn keyword txl_keyword contained mkdir mknod mkstring mod
-syn keyword txl_keyword contained multi multi-sort n-choose-k n-perm-k
-syn keyword txl_keyword contained nconc nilf none not
-syn keyword txl_keyword contained notf nreverse null nullify
-syn keyword txl_keyword contained num-chr num-str numberp oand
-syn keyword txl_keyword contained oddp op open-command open-directory
-syn keyword txl_keyword contained open-file open-files open-files* open-pipe
-syn keyword txl_keyword contained open-process open-tail openlog opip
-syn keyword txl_keyword contained or orf packagep partition
-syn keyword txl_keyword contained partition* partition-by perm pop
-syn keyword txl_keyword contained pos pos-if pos-max pos-min
-syn keyword txl_keyword contained posq posql posqual pppred
-syn keyword txl_keyword contained ppred pprinl pprint pprof
-syn keyword txl_keyword contained pred prinl print prof
-syn keyword txl_keyword contained prog1 progn prop proper-listp
-syn keyword txl_keyword contained push pushhash put-byte put-char
-syn keyword txl_keyword contained put-line put-lines put-string put-strings
-syn keyword txl_keyword contained pwd qquote quasi quasilist
-syn keyword txl_keyword contained quote 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 rperm rplaca rplacd run
-syn keyword txl_keyword contained s-ifblk s-ifchr s-ifdir s-ififo
-syn keyword txl_keyword contained s-iflnk s-ifmt s-ifreg s-ifsock
-syn keyword txl_keyword contained s-irgrp s-iroth s-irusr s-irwxg
-syn keyword txl_keyword contained s-irwxo s-irwxu s-isgid s-isuid
-syn keyword txl_keyword contained s-isvtx s-iwgrp s-iwoth s-iwusr
-syn keyword txl_keyword contained s-ixgrp s-ixoth s-ixusr search
-syn keyword txl_keyword contained search-regex search-str search-str-tree second
-syn keyword txl_keyword contained seek-stream select seqp set
-syn keyword txl_keyword contained set-diff set-hash-userdata set-sig-handler sethash
-syn keyword txl_keyword contained setitimer setlogmask sh 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-lost 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 sin sixth
-syn keyword txl_keyword contained size-vec some sort sort-group
-syn keyword txl_keyword contained source-loc source-loc-str span-str splice
-syn keyword txl_keyword contained split-str split-str-set sqrt sssucc
-syn keyword txl_keyword contained ssucc stat stdlib str<
-syn keyword txl_keyword contained str<= str= str> str>=
-syn keyword txl_keyword contained stream-get-prop stream-set-prop streamp string-extend
-syn keyword txl_keyword contained string-lt stringp sub sub-list
-syn keyword txl_keyword contained sub-str sub-vec succ symacrolet
-syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
-syn keyword txl_keyword contained symbolp symlink sys-qquote sys-splice
-syn keyword txl_keyword contained sys-unquote syslog tan tb
-syn keyword txl_keyword contained tc 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-usec tofloat
-syn keyword txl_keyword contained toint tok-str tok-where tostring
-syn keyword txl_keyword contained tostringp 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 tuples txr-case txr-if
-syn keyword txl_keyword contained txr-when typeof unget-byte unget-char
-syn keyword txl_keyword contained uniq unique unless unquote
-syn keyword txl_keyword contained until upcase-str update url-decode
-syn keyword txl_keyword contained url-encode usleep uw-protect vec
-syn keyword txl_keyword contained vec-push vec-set-length vecref vector
-syn keyword txl_keyword contained vector-list vectorp when where
-syn keyword txl_keyword contained while with-saved-vars wrap wrap*
-syn keyword txl_keyword contained zerop zip
+syn keyword txl_keyword contained apply aret ash asin
+syn keyword txl_keyword contained assoc assql atan atan2
+syn keyword txl_keyword contained atom bignump bit block
+syn keyword txl_keyword contained boundp break-str call car
+syn keyword txl_keyword contained caseq caseql casequal cat-str
+syn keyword txl_keyword contained cat-vec catch cdr ceil
+syn keyword txl_keyword contained chain chand chdir 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 close-stream
+syn keyword txl_keyword contained closelog cmp-str collect-each collect-each*
+syn keyword txl_keyword contained comb compl-span-str cond cons
+syn keyword txl_keyword contained conses conses* consp copy
+syn keyword txl_keyword contained copy-alist copy-cons copy-hash copy-list
+syn keyword txl_keyword contained copy-str copy-vec cos count-if
+syn keyword txl_keyword contained countq countql countqual cum-norm-dist
+syn keyword txl_keyword contained daemon dec defmacro defsymacro
+syn keyword txl_keyword contained defun defvar del delay
+syn keyword txl_keyword contained delete-package do dohash downcase-str
+syn keyword txl_keyword contained dwim each each* empty
+syn keyword txl_keyword contained env env-fbind env-hash env-vbind
+syn keyword txl_keyword contained eq eql equal errno
+syn keyword txl_keyword contained error eval evenp exit
+syn keyword txl_keyword contained exp expt exptmod false
+syn keyword txl_keyword contained fbind fboundp fifth filter-equal
+syn keyword txl_keyword contained filter-string-tree finalize find find-if
+syn keyword txl_keyword contained find-max find-min find-package first
+syn keyword txl_keyword contained fixnump flatten flatten* flet
+syn keyword txl_keyword contained flip flo-int flo-str floatp
+syn keyword txl_keyword contained floor flush-stream for for*
+syn keyword txl_keyword contained force format fourth fun
+syn keyword txl_keyword contained func-get-env func-get-form func-set-env functionp
+syn keyword txl_keyword contained gcd gen generate gensym
+syn keyword txl_keyword contained gequal get-byte get-char get-hash-userdata
+syn keyword txl_keyword contained get-line get-lines get-list-from-stream get-sig-handler
+syn keyword txl_keyword contained get-string get-string-from-stream gethash getitimer
+syn keyword txl_keyword contained getpid getppid giterate greater
+syn keyword txl_keyword contained group-by gun hash hash-alist
+syn keyword txl_keyword contained hash-construct hash-count hash-diff hash-eql
+syn keyword txl_keyword contained hash-equal hash-isec hash-keys hash-pairs
+syn keyword txl_keyword contained hash-uni hash-update hash-update-1 hash-values
+syn keyword txl_keyword contained hashp html-decode html-encode iapply
+syn keyword txl_keyword contained identity ido if iff
+syn keyword txl_keyword contained iffi in inc inhash
+syn keyword txl_keyword contained int-flo int-str integerp intern
+syn keyword txl_keyword contained interp-fun-p interpose ip ipf
+syn keyword txl_keyword contained isqrt itimer-prov itimer-real itimer-virtual
+syn keyword txl_keyword contained juxt keep-if keep-if* 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 lbind lcm
+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* link
+syn keyword txl_keyword contained lisp-parse list list* list-str
+syn keyword txl_keyword contained list-vector listp 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 macro-form-p macro-time macroexpand
+syn keyword txl_keyword contained macroexpand-1 macrolet major make-catenated-stream
+syn keyword txl_keyword contained make-env make-hash make-lazy-cons make-like
+syn keyword txl_keyword contained make-package make-random-state make-similar-hash make-string-byte-input-stream
+syn keyword txl_keyword contained make-string-input-stream make-string-output-stream make-strlist-output-stream make-sym
+syn keyword txl_keyword contained make-time make-time-utc make-trie makedev
+syn keyword txl_keyword contained mapcar mapcar* mapdo maphash
+syn keyword txl_keyword contained mappend mappend* mask match-fun
+syn keyword txl_keyword contained match-regex match-regex-right match-str match-str-tree
+syn keyword txl_keyword contained max member member-if memq
+syn keyword txl_keyword contained memql memqual merge min
+syn keyword txl_keyword contained minor mkdir mknod mkstring
+syn keyword txl_keyword contained mod multi multi-sort n-choose-k
+syn keyword txl_keyword contained n-perm-k nconc nilf none
+syn keyword txl_keyword contained not notf nreverse 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-files open-files*
+syn keyword txl_keyword contained open-pipe open-process open-tail openlog
+syn keyword txl_keyword contained opip or orf packagep
+syn keyword txl_keyword contained partition partition* partition-by perm
+syn keyword txl_keyword contained pop pos pos-if pos-max
+syn keyword txl_keyword contained pos-min posq posql posqual
+syn keyword txl_keyword contained pppred ppred pprinl pprint
+syn keyword txl_keyword contained pprof pred prinl print
+syn keyword txl_keyword contained prof prog1 progn prop
+syn keyword txl_keyword contained proper-listp push pushhash put-byte
+syn keyword txl_keyword contained put-char put-line put-lines put-string
+syn keyword txl_keyword contained put-strings pwd qquote quasi
+syn keyword txl_keyword contained quasilist quote rand random
+syn keyword txl_keyword contained random-fixnum random-state-p range range*
+syn keyword txl_keyword contained range-regex rcomb read readlink
+syn keyword txl_keyword contained real-time-stream-p reduce-left reduce-right ref
+syn keyword txl_keyword contained refset regex-compile regex-parse regexp
+syn keyword txl_keyword contained regsub rehome-sym remhash remove-if
+syn keyword txl_keyword contained remove-if* remove-path remq remq*
+syn keyword txl_keyword contained remql remql* remqual remqual*
+syn keyword txl_keyword contained rename-path repeat replace replace-list
+syn keyword txl_keyword contained replace-str replace-vec rest ret
+syn keyword txl_keyword contained retf return return-from reverse
+syn keyword txl_keyword contained rlcp rperm rplaca rplacd
+syn keyword txl_keyword contained run s-ifblk s-ifchr s-ifdir
+syn keyword txl_keyword contained s-ififo s-iflnk s-ifmt s-ifreg
+syn keyword txl_keyword contained s-ifsock s-irgrp s-iroth s-irusr
+syn keyword txl_keyword contained s-irwxg s-irwxo s-irwxu s-isgid
+syn keyword txl_keyword contained s-isuid s-isvtx s-iwgrp s-iwoth
+syn keyword txl_keyword contained s-iwusr s-ixgrp s-ixoth s-ixusr
+syn keyword txl_keyword contained search search-regex search-str search-str-tree
+syn keyword txl_keyword contained second seek-stream select seqp
+syn keyword txl_keyword contained set set-diff set-hash-userdata set-sig-handler
+syn keyword txl_keyword contained sethash setitimer setlogmask sh
+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-lost sig-pipe sig-poll
+syn keyword txl_keyword contained sig-prof sig-pwr sig-quit sig-segv
+syn keyword txl_keyword contained sig-stkflt sig-stop sig-sys sig-term
+syn keyword txl_keyword contained sig-trap sig-tstp sig-ttin sig-ttou
+syn keyword txl_keyword contained sig-urg sig-usr1 sig-usr2 sig-vtalrm
+syn keyword txl_keyword contained sig-winch sig-xcpu sig-xfsz sin
+syn keyword txl_keyword contained sixth size-vec some sort
+syn keyword txl_keyword contained sort-group source-loc source-loc-str span-str
+syn keyword txl_keyword contained splice split-str split-str-set sqrt
+syn keyword txl_keyword contained sssucc ssucc stat 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 sub
+syn keyword txl_keyword contained sub-list sub-str sub-vec succ
+syn keyword txl_keyword contained symacrolet symbol-function symbol-name symbol-package
+syn keyword txl_keyword contained symbol-value symbolp symlink sys-qquote
+syn keyword txl_keyword contained sys-splice sys-unquote syslog tan
+syn keyword txl_keyword contained tb tc 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-usec
+syn keyword txl_keyword contained tofloat toint tok-str tok-where
+syn keyword txl_keyword contained tostring tostringp transpose tree-bind
+syn keyword txl_keyword contained tree-case tree-find trie-add trie-compress
+syn keyword txl_keyword contained trie-lookup-begin trie-lookup-feed-char trie-value-at trim-str
+syn keyword txl_keyword contained true trunc tuples txr-case
+syn keyword txl_keyword contained txr-if txr-when typeof unget-byte
+syn keyword txl_keyword contained unget-char uniq unique unless
+syn keyword txl_keyword contained unquote until upcase-str update
+syn keyword txl_keyword contained url-decode url-encode usleep uw-protect
+syn keyword txl_keyword contained vec vec-push vec-set-length vecref
+syn keyword txl_keyword contained vector vector-list vectorp when
+syn keyword txl_keyword contained where while with-saved-vars wrap
+syn keyword txl_keyword contained wrap* zerop zip
 syn match txr_metanum "@[0-9]\+"
 syn match txr_nested_error "[^\t `]\+" contained