diff options
| author | Glenn Morris <[email protected]> | 2009-09-19 21:22:45 +0000 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2009-09-19 21:22:45 +0000 |
| commit | 547c692190b9d565e3b819f7a146c210fa062bbc (patch) | |
| tree | 618d379aae12576dc9aa3644fe218b96e3182483 /lisp | |
| parent | f3445fab9fa6609d316b3dbcabb40e02e7a4dfc4 (diff) | |
(calc-graph-lookup): Avoid assignment to free variable `var'.
Delete trailing whitespace.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/calc/calc-graph.el | 17 |
2 files changed, 12 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 590c26c27b..9419f4d1da 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2009-09-19 Glenn Morris <[email protected]> + * calc/calc-graph.el (calc-graph-lookup): Avoid assignment to free + variable `var'. + * calc/calc-alg.el (var): * calc/calcalg2.el (var): Define for compiler. diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el index cb50cf9ab2..c2ca50ac6f 100644 --- a/lisp/calc/calc-graph.el +++ b/lisp/calc/calc-graph.el @@ -227,7 +227,8 @@ (or found (let ((varname (concat "PlotData" (int-to-string - (1+ (length calc-graph-var-cache)))))) + (1+ (length calc-graph-var-cache))))) + var) (setq var (list 'var (intern varname) (intern (concat "var-" varname))) found (cons thing var) @@ -279,9 +280,9 @@ (defvar var-DUMMY2) (defvar var-PlotRejects) -;; The following variables are local to calc-graph-plot, but are +;; The following variables are local to calc-graph-plot, but are ;; used in the functions calc-graph-compute-2d, calc-graph-refine-2d, -;; calc-graph-recompute-2d, calc-graph-compute-3d and +;; calc-graph-recompute-2d, calc-graph-compute-3d and ;; calc-graph-format-data, which are called by calc-graph-plot. (defvar calc-graph-yvalue) (defvar calc-graph-yvec) @@ -725,7 +726,7 @@ calc-graph-yp (nconc calc-graph-yp (cons 0 (copy-sequence (cdr calc-graph-y3value)))) calc-graph-zp (nconc calc-graph-zp (cons '(skip) (copy-sequence (cdr (car calc-graph-yvalue))))))) - (setq calc-graph-numsteps (1- (* calc-graph-numsteps + (setq calc-graph-numsteps (1- (* calc-graph-numsteps (1+ calc-graph-numsteps3))))) (if (= (setq calc-graph-numsteps (1- (length calc-graph-yvalue))) 0) (error "Can't plot an empty vector")) @@ -1098,9 +1099,9 @@ This \"dumb\" driver will be present in Gnuplot 3.0." (buffer-substring (match-beginning 1) (match-end 1))))))) (unless yerr - (setq lenbl (or (equal mode "lines") + (setq lenbl (or (equal mode "lines") (equal mode "linespoints")) - penbl (or (equal mode "points") + penbl (or (equal mode "points") (equal mode "linespoints"))) (if lines (or (eq lines t) @@ -1117,7 +1118,7 @@ This \"dumb\" driver will be present in Gnuplot 3.0." (setq errform (condition-case nil (math-contains-sdev-p - (eval (intern + (eval (intern (concat "var-" (save-excursion (re-search-backward ":\\(.*\\)\\}") @@ -1134,7 +1135,7 @@ This \"dumb\" driver will be present in Gnuplot 3.0." (if penbl "linespoints" "lines") (if penbl "points" "dots")))) (if (and pstyle (> pstyle 0)) - (insert " " + (insert " " (if (and lstyle (> lstyle 0)) (int-to-string lstyle) "1") " " (int-to-string pstyle)) (if (and lstyle (> lstyle 0)) |