Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv24863 Modified Files: buffer.lisp Log Message: Fixed some code that was not great, and modified the name of a reader function of the no-such-offset condition that made a bug in CMUCL manifest itself and made it impossible to run Climacs. Date: Wed Jan 5 22:39:24 2005 Author: rstrandh Index: climacs/buffer.lisp diff -u climacs/buffer.lisp:1.15 climacs/buffer.lisp:1.16 --- climacs/buffer.lisp:1.15 Wed Jan 5 00:07:34 2005 +++ climacs/buffer.lisp Wed Jan 5 22:39:23 2005 @@ -76,10 +76,10 @@ (cursor :reader cursor)) (:documentation "A mixin class used in the initialization of a mark.")) -(defmethod offset (mark) +(defmethod offset ((mark mark-mixin)) (cursor-pos (cursor mark))) -(defmethod (setf offset) (new-offset mark) +(defmethod (setf offset) (new-offset (mark mark-mixin)) (assert (<= 0 new-offset (size (buffer mark))) () (make-condition 'no-such-offset :offset new-offset)) (setf (cursor-pos (cursor mark)) new-offset)) @@ -129,9 +129,9 @@ (make-instance type :buffer (buffer mark) :offset (offset mark))) (define-condition no-such-offset (simple-error) - ((offset :reader offset :initarg :offset)) + ((offset :reader condition-offset :initarg :offset)) (:report (lambda (condition stream) - (format stream "No such offset: ~a" (offset condition)))) + (format stream "No such offset: ~a" (condition-offset condition)))) (:documentation "This condition is signaled whenever an attempt is made at an operation that is before the beginning or after the end of the buffer."))