[Emacs-diffs] Changes to emacs/lisp/calc/calc-graph.el

[Jay Belanger]

Index: emacs/lisp/calc/calc-graph.el
diff -c emacs/lisp/calc/calc-graph.el:1.17 emacs/lisp/calc/calc-graph.el:1.18
*** emacs/lisp/calc/calc-graph.el:1.17  Fri Apr  1 21:44:53 2005
--- emacs/lisp/calc/calc-graph.el       Mon May  2 19:44:07 2005
***************
*** 407,419 ****
                                       (prin1-to-string output)))))
         (setq calc-graph-resolution (calc-graph-find-command "samples"))
         (if calc-graph-resolution
!            (setq calc-graph-resolution (string-to-int calc-graph-resolution))
           (setq calc-graph-resolution (if calc-graph-is-splot
                                calc-graph-default-resolution-3d
                              calc-graph-default-resolution)))
         (setq precision (calc-graph-find-command "precision"))
         (if precision
!            (setq precision (string-to-int precision))
           (setq precision calc-graph-default-precision))
         (calc-graph-set-command "terminal")
         (calc-graph-set-command "output")
--- 407,419 ----
                                       (prin1-to-string output)))))
         (setq calc-graph-resolution (calc-graph-find-command "samples"))
         (if calc-graph-resolution
!            (setq calc-graph-resolution (string-to-number 
calc-graph-resolution))
           (setq calc-graph-resolution (if calc-graph-is-splot
                                calc-graph-default-resolution-3d
                              calc-graph-default-resolution)))
         (setq precision (calc-graph-find-command "precision"))
         (if precision
!            (setq precision (string-to-number precision))
           (setq precision calc-graph-default-precision))
         (calc-graph-set-command "terminal")
         (calc-graph-set-command "output")
***************
*** 1078,1088 ****
                (setq mode (buffer-substring (match-beginning 1)
                                             (match-end 1))))
            (if (looking-at "[ \ta-z]+\\([0-9]+\\)")
!               (setq lstyle (string-to-int
                              (buffer-substring (match-beginning 1)
                                                (match-end 1)))))
            (if (looking-at "[ \ta-z]+[0-9]+[ \t]+\\([0-9]+\\)")
!               (setq pstyle (string-to-int
                              (buffer-substring (match-beginning 1)
                                                (match-end 1)))))))
        (setq lenbl (or (equal mode "lines") (equal mode "linespoints"))
--- 1078,1088 ----
                (setq mode (buffer-substring (match-beginning 1)
                                             (match-end 1))))
            (if (looking-at "[ \ta-z]+\\([0-9]+\\)")
!               (setq lstyle (string-to-number
                              (buffer-substring (match-beginning 1)
                                                (match-end 1)))))
            (if (looking-at "[ \ta-z]+[0-9]+[ \t]+\\([0-9]+\\)")
!               (setq pstyle (string-to-number
                              (buffer-substring (match-beginning 1)
                                                (match-end 1)))))))
        (setq lenbl (or (equal mode "lines") (equal mode "linespoints"))
***************
*** 1195,1205 ****
          (if (equal res "")
              (message "Default resolution is %d"
                       calc-graph-default-resolution)
!           (setq calc-graph-default-resolution (string-to-int res)))
        (if (equal res "")
            (message "Default 3D resolution is %d"
                     calc-graph-default-resolution-3d)
!         (setq calc-graph-default-resolution-3d (string-to-int res))))
      (calc-graph-set-command "samples" (if (not (equal res "")) res))))
  
  (defun calc-graph-device (name flag)
--- 1195,1205 ----
          (if (equal res "")
              (message "Default resolution is %d"
                       calc-graph-default-resolution)
!           (setq calc-graph-default-resolution (string-to-number res)))
        (if (equal res "")
            (message "Default 3D resolution is %d"
                     calc-graph-default-resolution-3d)
!         (setq calc-graph-default-resolution-3d (string-to-number res))))
      (calc-graph-set-command "samples" (if (not (equal res "")) res))))
  
  (defun calc-graph-device (name flag)
***************
*** 1456,1462 ****
                (goto-char origin)
                (re-search-forward
                 "G N U P L O T.*\n.*version \\([0-9]+\\)\\." nil t))
!             (setq calc-gnuplot-version (string-to-int (buffer-substring
                                                         (match-beginning 1)
                                                         (match-end 1))))
            (setq calc-gnuplot-version 1))
--- 1456,1462 ----
                (goto-char origin)
                (re-search-forward
                 "G N U P L O T.*\n.*version \\([0-9]+\\)\\." nil t))
!             (setq calc-gnuplot-version (string-to-number (buffer-substring
                                                         (match-beginning 1)
                                                         (match-end 1))))
            (setq calc-gnuplot-version 1))