diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-05-03 07:50:21 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-05-03 07:50:21 -0700 |
| commit | 76cf14f9ca312d6862515d7b9dc12c878eaa1d6b (patch) | |
| tree | cdc2c5a0435c7c9a3e027a1bc41c35e2f66c8f04 /lisp | |
| parent | f696dc883f332da27d6385a683c201e569b6da16 (diff) | |
| parent | 1d477a0fec2b31101960a75702d8ae1c99ed21e1 (diff) | |
| download | emacs-76cf14f9ca312d6862515d7b9dc12c878eaa1d6b.tar.gz | |
Merge from origin/emacs-27
1d477a0fec Recommend to avoid unnecessary abbreviations in doc
aea1b4db72 Revert "Fix calculator division truncation (bug#40892)"
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/calculator.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/calculator.el b/lisp/calculator.el index 7e0b2fcc6a3..6996990814d 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el @@ -864,7 +864,7 @@ The result should not exceed the screen width." "\\.\\([^0-9].*\\)?$" ".0\\1" str)) (str (replace-regexp-in-string "[eE][+-]?\\([^0-9].*\\)?$" "e0\\1" str))) - (float (string-to-number str))))) + (string-to-number str)))) (defun calculator-push-curnum () "Push the numeric value of the displayed number to the stack." |