From: Dieter K. <cra...@us...> - 2010-02-01 11:36:09
|
Update of /cvsroot/maxima/maxima/share/contrib/unit In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9740/share/contrib/unit Modified Files: unit-functions.lisp Log Message: Updating the function msetchk because of change in mlisp revision 1.84: Adding a range for $linel. $linel can have integer values from 1 to 10000. Related bug report: 2943400 - 'linel' command can crash 'maxima' No problems with the testuite. Index: unit-functions.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/share/contrib/unit/unit-functions.lisp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- unit-functions.lisp 25 Mar 2007 22:45:43 -0000 1.13 +++ unit-functions.lisp 1 Feb 2010 11:35:41 -0000 1.14 @@ -28,7 +28,12 @@ ((member x '($linel $fortindent $gensumnum $fpprintprec $floatwidth $parsewindow $ttyintnum) :test #'eq) (if (not (fixnump y)) (mseterr x y)) - (if (eq x '$linel) (setq linel y)) + (if (eq x '$linel) + (cond ((not (and (> y 0) ; at least one char per line + (< y 10001))) ; arbitrary chosen big value + (mseterr x y)) + (t + (setq linel y)))) (cond ((and (member x '($fortindent $gensumnum $floatwidth $ttyintnum) :test #'eq) (< y 0)) (mseterr x y)) ((and (eq x '$parsewindow) (< y -1)) (mseterr x y)) |