Use CLOSER-COMMON-LISP package to resolve conflicts between CL and C2MOP

[clinton/lisp-on-lines.git] / src / packages.lisp

diff --git a/src/packages.lisp b/src/packages.lisp
index 54a34af..c67c325 100644 (file)
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -1,8 +1,7 @@
 (defpackage #:lisp-on-lines
   (:use 
 (defpackage #:lisp-on-lines
   (:use 

-   :common-lisp

    #:contextl
    #:contextl

-   #:closer-mop
+   #:closer-common-lisp

 
    #:alexandria)
   (:nicknames #:lol)
 
    #:alexandria)
   (:nicknames #:lol)


@@ -10,10 +9,17 @@
 
    
 ;; Descriptions
 
    
 ;; Descriptions

-   #:find-description
+   #:*description*
+   #:description
+   #:defdescription
+   #:find-description   
+   #:current-description

    #:description-of
    #:define-description
    #:description-of
    #:define-description

+   #:defining-description

    #:described-object
    #:described-object

+   #:with-described-object
+   #:funcall-with-described-object

    #:described-class
    #:described-standard-class
    #:with-active-descriptions
    #:described-class
    #:described-standard-class
    #:with-active-descriptions


@@ -24,6 +30,7 @@
    #:define-display
    #:display
    #:display-using-description
    #:define-display
    #:display
    #:display-using-description

+   #:display-attribute-label

    #:*display*
    #:*object*
    
    #:*display*
    #:*object*
    


@@ -33,13 +40,19 @@
    #:attributes
    #:attribute-object
    #:attribute-label
    #:attributes
    #:attribute-object
    #:attribute-label

+   #:attribute-delimiter
+   #:attribute-setter
+   #:attribute-slot-name

    #:label
    #:label

+   #:attribute-active-p

    #:attribute-function
    #:attribute-value
    #:display-attribute-value
    #:active-attributes
    #:attribute-delimiter
    #:standard-attribute
    #:attribute-function
    #:attribute-value
    #:display-attribute-value
    #:active-attributes
    #:attribute-delimiter
    #:standard-attribute

+   #:funcall-with-attribute-context
+   #:with-attribute-context

 
    ;; Standard Library
    
 
    ;; Standard Library