X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=package.lisp;h=bba5fb8582082fe25be7731476e08761d23c9e05;hb=966fd9d857be6472f986c41d6c765df36eaaf2ac;hp=dd95e3c75e6bf36d4742db348ac93baaaff66faf;hpb=e1c2b781af8e10e078ab95920ce0208eb9f5e6bf;p=kmrcl.git

diff --git a/package.lisp b/package.lisp
index dd95e3c..bba5fb8 100644
--- a/package.lisp
+++ b/package.lisp
@@ -56,8 +56,8 @@
    #:count-string-char
    #:count-string-char-if
    #:hexchar
-   #:uriencode-string
-   #:uridecode-string
+   #:encode-uri-string
+   #:decode-uri-string
    #:non-alphanumericp
    #:random-string
    #:first-char
@@ -67,7 +67,8 @@
    #:string-strip-ending
    #:string-maybe-shorten
    #:shrink-vector
-
+   #:collapse-whitespace
+   
    ;; io.lisp
    #:indent-spaces
    #:indent-html-spaces
@@ -132,6 +133,7 @@
    #:mv-bind
    #:deflex
    #:def-cached-vector
+   #:def-cached-instance
    
    ;; files.lisp
    #:print-file-contents
@@ -211,11 +213,11 @@
    #:decode-uri-query-string
    
    ;; From xml-utils
-   #:wrap-with-xml
+   #:sgml-header-stream
    #:xml-tag-contents
    #:positions-xml-tag-contents
-   #:xml-cdata
-   #:write-xml-cdata
+   #:cdata-string
+   #:write-cdata
    
    ;; From console
    #:*console-msgs*
@@ -244,8 +246,9 @@
    #:fformat
 
    ;; os.lisp
-   #:run-shell-command
-
+   #:command-output
+   #:run-shell-command-output-stream
+   
    ;; color.lisp
    #:rgb->hsv
    #:rgb255->hsv255