From: Andreas E. <ar...@us...> - 2007-04-29 19:46:38
|
Update of /cvsroot/maxima/maxima/src In directory sc8-pr-cvs16:/tmp/cvs-serv23557/src Modified Files: plot.lisp Log Message: keys in case statements are not evaluated. Therefore they should not be quoted. Index: plot.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/plot.lisp,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- plot.lisp 25 Apr 2007 20:34:04 -0000 1.101 +++ plot.lisp 29 Apr 2007 19:46:13 -0000 1.102 @@ -554,7 +554,7 @@ ; VARS and SUBSCRIPTED-VARS are Maxima lists. ; Other lists are Lisp lists. (when (cdr subscripted-vars) - (setq gensym-vars (mapcar #'(lambda (x) (declare (ignore x)) (gensym)) + (setq gensym-vars (mapcar #'(lambda (ign) (declare (ignore ign)) (gensym)) (cdr subscripted-vars))) (mapcar #'(lambda (a b) (setq vars (subst b a vars :test 'equal))) (cdr subscripted-vars) gensym-vars) @@ -1240,22 +1240,22 @@ (dolist (v options) (if ($listp v) (case (second v) - ('$logx (setf log-x t)) - ('$logy (setf log-y t)) - ('$box (setf box (cddr v))) - ('$xlabel (setf xlabel (print-invert-case (stripdollar (third v))))) - ('$ylabel (setf ylabel (print-invert-case (stripdollar (third v))))) - ('$x (when (fourth v) + ($logx (setf log-x t)) + ($logy (setf log-y t)) + ($box (setf box (cddr v))) + ($xlabel (setf xlabel (print-invert-case (stripdollar (third v))))) + ($ylabel (setf ylabel (print-invert-case (stripdollar (third v))))) + ($x (when (fourth v) (setf xmin (meval (third v))) (setf xmax (meval (fourth v))) ($set_plot_option `((mlist) $x ,xmin ,xmax))) (unless xlabel (setf xlabel "x"))) - ('$y (when (fourth v) + ($y (when (fourth v) (setf ymin (meval (third v))) (setf ymax (meval (fourth v))) ($set_plot_option `((mlist) $y ,ymin ,ymax)))) - ('$style (setf styles (cddr v))) - ('$legend (setf legend (cddr v))) + ($style (setf styles (cddr v))) + ($legend (setf legend (cddr v))) (t ($set_plot_option v))) (merror "Option ~M should be a list" v))) (when (and xlabel log-x) (setf xlabel (format nil "log(~a)" xlabel))) |