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

[Jay Belanger]

Index: emacs/lisp/calc/calc-aent.el
diff -c emacs/lisp/calc/calc-aent.el:1.26 emacs/lisp/calc/calc-aent.el:1.27
*** emacs/lisp/calc/calc-aent.el:1.26   Tue Apr  5 03:50:26 2005
--- emacs/lisp/calc/calc-aent.el        Mon May  2 19:40:50 2005
***************
*** 1,6 ****
  ;;; calc-aent.el --- algebraic entry functions for Calc
  
! ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
  
  ;; Author: Dave Gillespie <address@hidden>
  ;; Maintainer: Jay Belanger <address@hidden>
--- 1,6 ----
  ;;; calc-aent.el --- algebraic entry functions for Calc
  
! ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, 
Inc.
  
  ;; Author: Dave Gillespie <address@hidden>
  ;; Maintainer: Jay Belanger <address@hidden>
***************
*** 734,740 ****
                       math-exp-pos (match-end 1))
               (if (eq (string-match "\\$\\([1-9][0-9]*\\)" math-exp-str 
math-exp-pos)
                       math-exp-pos)
!                  (setq math-expr-data (- (string-to-int (math-match-substring
                                                     math-exp-str 1))))
                 (string-match "\\$+" math-exp-str math-exp-pos)
                 (setq math-expr-data (- (match-end 0) (match-beginning 0))))
--- 734,740 ----
                       math-exp-pos (match-end 1))
               (if (eq (string-match "\\$\\([1-9][0-9]*\\)" math-exp-str 
math-exp-pos)
                       math-exp-pos)
!                  (setq math-expr-data (- (string-to-number 
(math-match-substring
                                                     math-exp-str 1))))
                 (string-match "\\$+" math-exp-str math-exp-pos)
                 (setq math-expr-data (- (match-end 0) (match-beginning 0))))
***************
*** 743,749 ****
            ((eq ch ?\#)
             (if (eq (string-match "#\\([1-9][0-9]*\\)" math-exp-str 
math-exp-pos)
                     math-exp-pos)
!                (setq math-expr-data (string-to-int
                                 (math-match-substring math-exp-str 1))
                       math-exp-pos (match-end 0))
               (setq math-expr-data 1
--- 743,749 ----
            ((eq ch ?\#)
             (if (eq (string-match "#\\([1-9][0-9]*\\)" math-exp-str 
math-exp-pos)
                     math-exp-pos)
!                (setq math-expr-data (string-to-number
                                 (math-match-substring math-exp-str 1))
                       math-exp-pos (match-end 0))
               (setq math-expr-data 1