aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2005-05-02 19:40:50 +0000
committerJay Belanger2005-05-02 19:40:50 +0000
commit36692c4a90325481b9236a23efffd5ddca2d8319 (patch)
tree86561738000fff5428bc59ce3d8d0b8bee49ffd1
parent0124c5bdea37ac8b42b22472e3a0dcfbf7ea795a (diff)
downloademacs-36692c4a90325481b9236a23efffd5ddca2d8319.tar.gz
emacs-36692c4a90325481b9236a23efffd5ddca2d8319.zip
(math-read-token): Replace string-to-int by string-to-number.
-rw-r--r--lisp/calc/calc-aent.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index a2d6e9dc88c..b947b597acf 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -1,6 +1,6 @@
1;;; calc-aent.el --- algebraic entry functions for Calc 1;;; calc-aent.el --- algebraic entry functions for Calc
2 2
3;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc. 3;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc.
4 4
5;; Author: Dave Gillespie <daveg@synaptics.com> 5;; Author: Dave Gillespie <daveg@synaptics.com>
6;; Maintainer: Jay Belanger <belanger@truman.edu> 6;; Maintainer: Jay Belanger <belanger@truman.edu>
@@ -734,7 +734,7 @@ in Calc algebraic input.")
734 math-exp-pos (match-end 1)) 734 math-exp-pos (match-end 1))
735 (if (eq (string-match "\\$\\([1-9][0-9]*\\)" math-exp-str math-exp-pos) 735 (if (eq (string-match "\\$\\([1-9][0-9]*\\)" math-exp-str math-exp-pos)
736 math-exp-pos) 736 math-exp-pos)
737 (setq math-expr-data (- (string-to-int (math-match-substring 737 (setq math-expr-data (- (string-to-number (math-match-substring
738 math-exp-str 1)))) 738 math-exp-str 1))))
739 (string-match "\\$+" math-exp-str math-exp-pos) 739 (string-match "\\$+" math-exp-str math-exp-pos)
740 (setq math-expr-data (- (match-end 0) (match-beginning 0)))) 740 (setq math-expr-data (- (match-end 0) (match-beginning 0))))
@@ -743,7 +743,7 @@ in Calc algebraic input.")
743 ((eq ch ?\#) 743 ((eq ch ?\#)
744 (if (eq (string-match "#\\([1-9][0-9]*\\)" math-exp-str math-exp-pos) 744 (if (eq (string-match "#\\([1-9][0-9]*\\)" math-exp-str math-exp-pos)
745 math-exp-pos) 745 math-exp-pos)
746 (setq math-expr-data (string-to-int 746 (setq math-expr-data (string-to-number
747 (math-match-substring math-exp-str 1)) 747 (math-match-substring math-exp-str 1))
748 math-exp-pos (match-end 0)) 748 math-exp-pos (match-end 0))
749 (setq math-expr-data 1 749 (setq math-expr-data 1