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 07ff448..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)


@@ -11,12 +10,16 @@
    
 ;; Descriptions
    #:*description*
    
 ;; Descriptions
    #:*description*

+   #:description
+   #:defdescription

    #:find-description   
    #:find-description   

+   #:current-description

    #:description-of
    #:define-description
    #:defining-description
    #:described-object
    #:with-described-object
    #:description-of
    #:define-description
    #:defining-description
    #: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


@@ -38,6 +41,7 @@
    #:attribute-object
    #:attribute-label
    #:attribute-delimiter
    #:attribute-object
    #:attribute-label
    #:attribute-delimiter

+   #:attribute-setter

    #:attribute-slot-name
    #:label
    #:attribute-active-p
    #:attribute-slot-name
    #:label
    #:attribute-active-p