diff options
| author | Jay Belanger | 2009-02-21 19:19:58 +0000 |
|---|---|---|
| committer | Jay Belanger | 2009-02-21 19:19:58 +0000 |
| commit | 7b3752ab87a08bab14453cc9c30abf42bb31b227 (patch) | |
| tree | 29459acb80b61be94024f968a8dfb72bd106b614 /lisp | |
| parent | 2f49167cb2a488c281419662119af0162c154e0c (diff) | |
| download | emacs-7b3752ab87a08bab14453cc9c30abf42bb31b227.tar.gz emacs-7b3752ab87a08bab14453cc9c30abf42bb31b227.zip | |
(math-use-emacs-fn): Make sure that the lisp number is in decimal.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/calc/calc-math.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 19b20ede0d6..44ddc6a3485 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-02-21 Jay Belanger <jay.p.belanger@gmail.com> | ||
| 2 | |||
| 3 | * calc/calc-math.el (math-use-emacs-fn): Make sure that the | ||
| 4 | lisp number is in decimal. | ||
| 5 | |||
| 1 | 2009-02-21 Chong Yidong <cyd@stupidchicken.com> | 6 | 2009-02-21 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * progmodes/compile.el (compilation-error-regexp-alist-alist): | 8 | * progmodes/compile.el (compilation-error-regexp-alist-alist): |
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el index 64c5465da3c..c8e8cc1f052 100644 --- a/lisp/calc/calc-math.el +++ b/lisp/calc/calc-math.el | |||
| @@ -105,7 +105,9 @@ If this can't be done, return NIL." | |||
| 105 | (math-read-number | 105 | (math-read-number |
| 106 | (number-to-string | 106 | (number-to-string |
| 107 | (funcall fn | 107 | (funcall fn |
| 108 | (string-to-number (math-format-number (math-float x)))))) | 108 | (string-to-number |
| 109 | (let ((calc-number-radix 10)) | ||
| 110 | (math-format-number (math-float x))))))) | ||
| 109 | (error nil)))))) | 111 | (error nil)))))) |
| 110 | 112 | ||
| 111 | (defun calc-sqrt (arg) | 113 | (defun calc-sqrt (arg) |