diff --git a/clim/standard-types.lisp b/clim/standard-types.lisp index adf448ec2aa2937b5801c0d10da6b51074454277..9b04720bc57197725fe46bf4ad5bacb584d9e84e 100644 --- a/clim/standard-types.lisp +++ b/clim/standard-types.lisp @@ -952,12 +952,20 @@ ;;;; Sequence Presentation Types -(define-presentation-type sequence (element-type) +#+sbcl(define-presentation-type sequence (element-type) :inherit-from (find-class 't) ;enforce CL definition ; NOTE changed "t" to "(find-class 't)" -- jacek.zlydach, 2017-05-06 :parameters-are-types t :options ((separator #\,) (echo-space t))) +;;; NOTE CCL seems to like it the old way -- jacek.zlydach, 2017-05-06 +#-sbcl(define-presentation-type sequence (element-type) + :inherit-from t ;enforce CL definition + :parameters-are-types t + :options ((separator #\,) + (echo-space t))) + + (define-presentation-method describe-presentation-type :after ((type sequence) stream plural-count) (declare (ignore plural-count)) ;primary method gets it diff --git a/clx/clx-port.lisp b/clx/clx-port.lisp index 43effd5ab34085f5ecaa236801db808b76880e72..b7f6da3310c7e14610932050a4b6c343bb926c83 100644 --- a/clx/clx-port.lisp +++ b/clx/clx-port.lisp @@ -62,6 +62,7 @@ #+Allegro (or (system:getenv "DISPLAY") (short-site-name)) #+Lucid (or (lcl:environment-variable "DISPLAY") (machine-instance)) #+CCL (or (ccl:getenv "DISPLAY") (machine-instance)) + #+sbcl (or (sb-posix:getenv "DISPLAY") (machine-instance)) )) (multiple-value-bind (host display-number nscreen) (disassemble-display-spec host (or display-number 0) (or screen 0)) @@ -105,7 +106,6 @@ :background *clx-white-color*)))))))) (defun disassemble-display-spec (display &optional (default-display 0) (default-screen 0)) - (declare (values host display-number nscreen)) (let ((host-n (position #\: display))) (unless host-n (return-from disassemble-display-spec diff --git a/silica/classes.lisp b/silica/classes.lisp index 2490b7791b84ee7b626dee8f3aa099cf37208c7f..d28142565ad2801631493901ccbdca421848a0c5 100644 --- a/silica/classes.lisp +++ b/silica/classes.lisp @@ -74,6 +74,12 @@ v)) (:-ics (make-hash-table :test #'equal)))) +;;; NOTE temporary definition to make examples work; not sure +;;; what implementation would be right. -- jacek.zlydach, 2017-05-06 +#+ (or sbcl ccl) +(defun mapping-table-initform () + (make-hash-table :test #'equal)) + #+(and Allegro (not (or aclpc acl86win32))) (defun mapping-cache-initform () (excl:ics-target-case @@ -84,6 +90,12 @@ v)) (:-ics (cons nil nil)))) +;;; NOTE temporary definition to make examples work; not sure +;;; what implementation would be right. -- jacek.zlydach, 2017-05-06 +#+ (or sbcl ccl) +(defun mapping-cache-initform () + (cons nil nil)) + (define-protocol-class sheet ()) (defclass basic-sheet (sheet)