diff options
| author | Jay Belanger | 2005-05-02 19:44:07 +0000 |
|---|---|---|
| committer | Jay Belanger | 2005-05-02 19:44:07 +0000 |
| commit | 723c2377e838218e7689c7ab6943dccce71c40ed (patch) | |
| tree | cd4dc4181771faa7b676c4727c29bd952f521698 | |
| parent | d227f871c91e27aa7b7c117284f15d88a4eed4a9 (diff) | |
| download | emacs-723c2377e838218e7689c7ab6943dccce71c40ed.tar.gz emacs-723c2377e838218e7689c7ab6943dccce71c40ed.zip | |
(calc-graph-plot, calc-graph-set-styles, calc-graph-num-points)
(calc-graph-init): Replace string-to-int by string-to-number.
| -rw-r--r-- | lisp/calc/calc-graph.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el index 6a58a6215fa..09bea69cf73 100644 --- a/lisp/calc/calc-graph.el +++ b/lisp/calc/calc-graph.el | |||
| @@ -407,13 +407,13 @@ | |||
| 407 | (prin1-to-string output))))) | 407 | (prin1-to-string output))))) |
| 408 | (setq calc-graph-resolution (calc-graph-find-command "samples")) | 408 | (setq calc-graph-resolution (calc-graph-find-command "samples")) |
| 409 | (if calc-graph-resolution | 409 | (if calc-graph-resolution |
| 410 | (setq calc-graph-resolution (string-to-int calc-graph-resolution)) | 410 | (setq calc-graph-resolution (string-to-number calc-graph-resolution)) |
| 411 | (setq calc-graph-resolution (if calc-graph-is-splot | 411 | (setq calc-graph-resolution (if calc-graph-is-splot |
| 412 | calc-graph-default-resolution-3d | 412 | calc-graph-default-resolution-3d |
| 413 | calc-graph-default-resolution))) | 413 | calc-graph-default-resolution))) |
| 414 | (setq precision (calc-graph-find-command "precision")) | 414 | (setq precision (calc-graph-find-command "precision")) |
| 415 | (if precision | 415 | (if precision |
| 416 | (setq precision (string-to-int precision)) | 416 | (setq precision (string-to-number precision)) |
| 417 | (setq precision calc-graph-default-precision)) | 417 | (setq precision calc-graph-default-precision)) |
| 418 | (calc-graph-set-command "terminal") | 418 | (calc-graph-set-command "terminal") |
| 419 | (calc-graph-set-command "output") | 419 | (calc-graph-set-command "output") |
| @@ -1078,11 +1078,11 @@ This \"dumb\" driver will be present in Gnuplot 3.0." | |||
| 1078 | (setq mode (buffer-substring (match-beginning 1) | 1078 | (setq mode (buffer-substring (match-beginning 1) |
| 1079 | (match-end 1)))) | 1079 | (match-end 1)))) |
| 1080 | (if (looking-at "[ \ta-z]+\\([0-9]+\\)") | 1080 | (if (looking-at "[ \ta-z]+\\([0-9]+\\)") |
| 1081 | (setq lstyle (string-to-int | 1081 | (setq lstyle (string-to-number |
| 1082 | (buffer-substring (match-beginning 1) | 1082 | (buffer-substring (match-beginning 1) |
| 1083 | (match-end 1))))) | 1083 | (match-end 1))))) |
| 1084 | (if (looking-at "[ \ta-z]+[0-9]+[ \t]+\\([0-9]+\\)") | 1084 | (if (looking-at "[ \ta-z]+[0-9]+[ \t]+\\([0-9]+\\)") |
| 1085 | (setq pstyle (string-to-int | 1085 | (setq pstyle (string-to-number |
| 1086 | (buffer-substring (match-beginning 1) | 1086 | (buffer-substring (match-beginning 1) |
| 1087 | (match-end 1))))))) | 1087 | (match-end 1))))))) |
| 1088 | (setq lenbl (or (equal mode "lines") (equal mode "linespoints")) | 1088 | (setq lenbl (or (equal mode "lines") (equal mode "linespoints")) |
| @@ -1195,11 +1195,11 @@ This \"dumb\" driver will be present in Gnuplot 3.0." | |||
| 1195 | (if (equal res "") | 1195 | (if (equal res "") |
| 1196 | (message "Default resolution is %d" | 1196 | (message "Default resolution is %d" |
| 1197 | calc-graph-default-resolution) | 1197 | calc-graph-default-resolution) |
| 1198 | (setq calc-graph-default-resolution (string-to-int res))) | 1198 | (setq calc-graph-default-resolution (string-to-number res))) |
| 1199 | (if (equal res "") | 1199 | (if (equal res "") |
| 1200 | (message "Default 3D resolution is %d" | 1200 | (message "Default 3D resolution is %d" |
| 1201 | calc-graph-default-resolution-3d) | 1201 | calc-graph-default-resolution-3d) |
| 1202 | (setq calc-graph-default-resolution-3d (string-to-int res)))) | 1202 | (setq calc-graph-default-resolution-3d (string-to-number res)))) |
| 1203 | (calc-graph-set-command "samples" (if (not (equal res "")) res)))) | 1203 | (calc-graph-set-command "samples" (if (not (equal res "")) res)))) |
| 1204 | 1204 | ||
| 1205 | (defun calc-graph-device (name flag) | 1205 | (defun calc-graph-device (name flag) |
| @@ -1456,7 +1456,7 @@ This \"dumb\" driver will be present in Gnuplot 3.0." | |||
| 1456 | (goto-char origin) | 1456 | (goto-char origin) |
| 1457 | (re-search-forward | 1457 | (re-search-forward |
| 1458 | "G N U P L O T.*\n.*version \\([0-9]+\\)\\." nil t)) | 1458 | "G N U P L O T.*\n.*version \\([0-9]+\\)\\." nil t)) |
| 1459 | (setq calc-gnuplot-version (string-to-int (buffer-substring | 1459 | (setq calc-gnuplot-version (string-to-number (buffer-substring |
| 1460 | (match-beginning 1) | 1460 | (match-beginning 1) |
| 1461 | (match-end 1)))) | 1461 | (match-end 1)))) |
| 1462 | (setq calc-gnuplot-version 1)) | 1462 | (setq calc-gnuplot-version 1)) |