diff options
| author | Colin Walters | 2002-04-14 05:50:05 +0000 |
|---|---|---|
| committer | Colin Walters | 2002-04-14 05:50:05 +0000 |
| commit | 91da64426a85ffb408bae710492b932d4fdb0028 (patch) | |
| tree | 59e160a7d783e4cabc604efbfeebdafcd349f767 | |
| parent | bde5791106abfdd8a7738419481f2074b6ae7e98 (diff) | |
| download | emacs-91da64426a85ffb408bae710492b932d4fdb0028.tar.gz emacs-91da64426a85ffb408bae710492b932d4fdb0028.zip | |
(math-format-number): Load `calc-ext' before we call
`math-group-float'.
| -rw-r--r-- | lisp/calc/calc.el | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index f83f922837f..290ac5c963c 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el | |||
| @@ -3145,8 +3145,9 @@ If mouse is pressed in Calc window, push cut buffer contents onto the stack." | |||
| 3145 | (setq str (concat (substring str 0 (- figs)) point | 3145 | (setq str (concat (substring str 0 (- figs)) point |
| 3146 | (substring str (- figs)))) | 3146 | (substring str (- figs)))) |
| 3147 | (setq str (concat str point))) | 3147 | (setq str (concat str point))) |
| 3148 | (if calc-group-digits | 3148 | (when calc-group-digits |
| 3149 | (setq str (math-group-float str)))) | 3149 | (require 'calc-ext) |
| 3150 | (setq str (math-group-float str)))) | ||
| 3150 | (if (< figs 0) | 3151 | (if (< figs 0) |
| 3151 | (setq figs (+ calc-internal-prec figs))) | 3152 | (setq figs (+ calc-internal-prec figs))) |
| 3152 | (if (> figs 0) | 3153 | (if (> figs 0) |
| @@ -3174,8 +3175,9 @@ If mouse is pressed in Calc window, push cut buffer contents onto the stack." | |||
| 3174 | (t ; (< dpos 0) | 3175 | (t ; (< dpos 0) |
| 3175 | (setq str (concat "0" point | 3176 | (setq str (concat "0" point |
| 3176 | (make-string (- dpos) ?0) str)))) | 3177 | (make-string (- dpos) ?0) str)))) |
| 3177 | (if calc-group-digits | 3178 | (when calc-group-digits |
| 3178 | (setq str (math-group-float str)))) | 3179 | (require 'calc-ext) |
| 3180 | (setq str (math-group-float str)))) | ||
| 3179 | (let* ((eadj (+ exp len)) | 3181 | (let* ((eadj (+ exp len)) |
| 3180 | (scale (if (eq fmt 'eng) | 3182 | (scale (if (eq fmt 'eng) |
| 3181 | (1+ (math-mod (+ eadj 300002) 3)) | 3183 | (1+ (math-mod (+ eadj 300002) 3)) |
| @@ -3186,8 +3188,9 @@ If mouse is pressed in Calc window, push cut buffer contents onto the stack." | |||
| 3186 | (if (< scale (length str)) | 3188 | (if (< scale (length str)) |
| 3187 | (setq str (concat (substring str 0 scale) point | 3189 | (setq str (concat (substring str 0 scale) point |
| 3188 | (substring str scale)))) | 3190 | (substring str scale)))) |
| 3189 | (if calc-group-digits | 3191 | (when calc-group-digits |
| 3190 | (setq str (math-group-float str))) | 3192 | (require 'calc-ext) |
| 3193 | (setq str (math-group-float str))) | ||
| 3191 | (setq str (format (if (memq calc-language '(math maple)) | 3194 | (setq str (format (if (memq calc-language '(math maple)) |
| 3192 | (if (and prec (> prec 191)) | 3195 | (if (and prec (> prec 191)) |
| 3193 | "(%s*10.^%d)" "%s*10.^%d") | 3196 | "(%s*10.^%d)" "%s*10.^%d") |