Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv23869
Modified Files: presentations.lisp Log Message: I must have been asleep, my `funcall-presentation-generic-function' fix broke the function completely. Unbroke it now.
--- /project/mcclim/cvsroot/mcclim/presentations.lisp 2007/11/19 21:14:01 1.81 +++ /project/mcclim/cvsroot/mcclim/presentations.lisp 2007/11/19 22:04:29 1.82 @@ -1156,12 +1156,13 @@ (error "~S is not a presentation generic function" name)) (let* ((rebound-args (loop for arg in args unless (symbolp arg) - collect (list (gensym "ARG")))) + collect (list (gensym "ARG") arg))) (gf-name (generic-function-name gf)) - (type-spec-var (car (nth (1- (type-arg-position gf)) rebound-args)))) + (type-spec-var (nth (1- (type-arg-position gf)) args))) `(let ,rebound-args (,gf-name (prototype-or-error (presentation-type-name - ,type-spec-var)) + ,(or (first (find type-spec-var rebound-args :key #'second)) + type-spec-var))) ,@(mapcar #'(lambda (arg) ;; Order of evaluation doesn't matter ;; for symbols, and this shuts up