chiark / gitweb /
Merge branch 'master' of /home/mdw/public-git/lisp
authorMark Wooding <mdw@distorted.org.uk>
Wed, 24 May 2006 08:12:14 +0000 (09:12 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 24 May 2006 08:12:14 +0000 (09:12 +0100)
* '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.

1  2 
mdw-mop.lisp

diff --cc mdw-mop.lisp
index e7ea27ccd90acf7ef96ad220df78c556b0c409e8,f274dcb17a88730350ee4c6fe0cd6f76b3285f05..ff43c11a53ea437760cc681081ef8a4177260bad
  ;;; 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