aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/calc
diff options
context:
space:
mode:
authorJay Belanger <[email protected]>2012-01-20 18:46:09 -0600
committerJay Belanger <[email protected]>2012-01-20 18:46:09 -0600
commitdd6f2a637de3c4e91a2633e06344b6a0e3bbac70 (patch)
tree671a5f1ddc048c36601f7bb236f783ad12f2d5d2 /lisp/calc
parent117a9ea130c92a79b9b6f2a0bdc5fb297256d19c (diff)
calc/calc-units.el (math-put-default-units): Don't use "1" as a
default unit.
Diffstat (limited to 'lisp/calc')
-rw-r--r--lisp/calc/calc-units.el19
1 files changed, 10 insertions, 9 deletions
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 8f4c79e3f0..dcbf845c37 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -415,18 +415,19 @@ If EXPR is nil, return nil."
(defun math-put-default-units (expr)
"Put the units in EXPR in the default units table."
- (let* ((units (math-get-units expr))
- (standard-units (math-get-standard-units expr))
+ (let ((units (math-get-units expr)))
+ (unless (eq units 1)
+ (let* ((standard-units (math-get-standard-units expr))
(default-units (gethash
standard-units
math-default-units-table)))
- (cond
- ((not default-units)
- (puthash standard-units (list units) math-default-units-table))
- ((not (equal units (car default-units)))
- (puthash standard-units
- (list units (car default-units))
- math-default-units-table)))))
+ (cond
+ ((not default-units)
+ (puthash standard-units (list units) math-default-units-table))
+ ((not (equal units (car default-units)))
+ (puthash standard-units
+ (list units (car default-units))
+ math-default-units-table)))))))
(defun calc-convert-units (&optional old-units new-units)