From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 24 May 2006 08:12:14 +0000 (+0100)
Subject: Merge branch 'master' of /home/mdw/public-git/lisp
X-Git-Url: https://git.distorted.org.uk/~mdw/lisp/commitdiff_plain/84f4b59f93535e938e21a083e05a49a1f20f9c26

Merge branch 'master' of /home/mdw/public-git/lisp

* 'master' of /home/mdw/public-git/lisp:
  optparse: Process docstring and declarations correctly in defopthandler.
  gitignore: Ignore CLisp FASL files.
  Various: Try porting the code to CLisp.

Conflicts:

	mdw-mop.lisp: Trivial conflict in the defpackage stanza.
---

84f4b59f93535e938e21a083e05a49a1f20f9c26
diff --cc mdw-mop.lisp
index e7ea27c,f274dcb..ff43c11
--- a/mdw-mop.lisp
+++ b/mdw-mop.lisp
@@@ -27,10 -27,9 +27,10 @@@
  ;;; Packages.
  
  (defpackage #:mdw.mop
-   (:use #:common-lisp #:mdw.base #+cmu #:mop)
+   (:use #:common-lisp #:mdw.base #+(or cmu clisp) #:mop)
 -  (:export #:compatible-class
 -	   #:copy-instance #:copy-instance-using-class
 +  (:export #:copy-instance #:copy-instance-using-class
 +	   #:with-slot-variables
 +	   #:compatible-class
  	   #:initargs-for-effective-slot #:make-effective-slot
  	   #:filtered-slot-class-mixin
  	     #:filtered-direct-slot-definition