From 43fdb2a08061afba00243b164111c289d711d976 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Wed, 28 Jan 2015 21:29:58 -0600 Subject: [PATCH] * lisp/calc/calc-units.el (math-consistent-units-p): Strengthen the test for consistent units. --- lisp/ChangeLog | 1 + lisp/calc/calc-units.el | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4d7f2f75e57..bc1d1478fe7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,7 @@ * lisp/calc/calc-units.el (calc-convert-exact-units): New function. (calc-convert-units): Check for missing units. + (math-consistent-units-p): Strengthen the test for consistent units. * lisp/calc/calc-ext.el (calc-init-extensions): Autoload `calc-convert-exact-units' and assign it a keybinding. diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index 8442cf9ff25..33cbcac7a2d 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -979,7 +979,7 @@ If COMP or STD is non-nil, put that in the units table instead." (or (and (eq (car-safe newunits) 'var) (assq (nth 1 newunits) math-standard-units-systems)) - (math-numberp (math-get-units (list '/ expr newunits))))) + (math-numberp (math-get-units (math-to-standard-units (list '/ expr newunits) nil))))) (defun math-check-unit-consistency (expr units) "Give an error if EXPR and UNITS do not have consistent units." -- 2.39.2