* calc/calc.el (calc-ensure-consistent-units): New variable.

* calc/calc-units.el (math-consistent-units-p, math-check-unit-consistency):
  New functions.
  (calc-quick-units, calc-convert-units): Use `math-check-unit-consistency' when 
  `calc-ensure-consistent-units' is non-nil. 
  (calc-extract-units): Fix typo.

* doc/misc/calc.texi
  (Basic Operations on Units, Customizing Calc):
  Mention `calc-ensure-consistent-units'.

3 files changed, 36 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed24a1eb176..91778032966 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2012-05-19  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/calc.el (calc-ensure-consistent-units): New variable.
+
+        * calc/calc-units.el (math-consistent-units-p, math-check-unit-consistency):
+        New functions.
+        (calc-quick-units, calc-convert-units): Use `math-check-unit-consistency' when
+        `calc-ensure-consistent-units' is non-nil.
+        (calc-extract-units): Fix typo.
+
 2012-05-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * vc/vc-bzr.el (vc-bzr-state-heuristic): Save match-data around sha1.
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 9d2583085a2..f4100f38831 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -370,8 +370,11 @@ Entries are (SYMBOL EXPR DOC-STRING TEMP-TYPE BASE-UNITS).")
      (unless (< pos (length units))
        (error "Unit number %d not defined" pos))
      (if (math-units-in-expr-p expr nil)
-         (calc-enter-result 1 (format "cun%d" num)
-                            (math-convert-units expr (nth pos units)))
+         (progn
+           (if calc-ensure-consistent-units
+               (math-check-unit-consistency expr units))
+           (calc-enter-result 1 (format "cun%d" num)
+                              (math-convert-units expr (nth pos units))))
        (calc-enter-result 1 (format "*un%d" num)
                           (math-simplify-units
                            (math-mul expr (nth pos units))))))))
@@ -477,6 +480,8 @@ If EXPR is nil, return nil."
      (setq units (math-read-expr new-units))
      (when (eq (car-safe units) 'error)
        (error "Bad format in units expression: %s" (nth 2 units)))
+     (if calc-ensure-consistent-units
+         (math-check-unit-consistency expr units))
      (math-put-default-units units)
      (let ((unew (math-units-in-expr-p units t))
            (std (and (eq (car-safe units) 'var)
@@ -560,7 +565,7 @@ If EXPR is nil, return nil."
 (defun calc-extract-units ()
   (interactive)
   (calc-slow-wrapper
-   (calc-enter-result 1 "rmun" (math-simplify-units
+   (calc-enter-result 1 "exun" (math-simplify-units
                                 (math-extract-units (calc-top-n 1))))))
 
 ;; The variables calc-num-units and calc-den-units are local to
@@ -914,6 +919,17 @@ If EXPR is nil, return nil."
            (math-single-units-in-expr-p (nth 1 expr))))
         (t 'wrong)))
 
+(defun math-consistent-units-p (expr1 expr2)
+  "Non-nil if EXPR1 and EXPR2 have consistent units."
+  (math-numberp (math-get-units (list '/ expr1 expr2))))
+
+(defun math-check-unit-consistency (expr units)
+  "Give an error if EXPR and UNITS do not have consistent units."
+  (unless  (math-consistent-units-p expr units)
+    (error "New units (%s) are inconsistent with current units (%s)"
+           (math-format-value units)
+           (math-format-value (math-get-units expr)))))
+
 (defun math-check-unit-name (v)
   (and (eq (car-safe v) 'var)
        (or (assq (nth 1 v) (or math-units-table (math-build-units-table)))
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index c7cea5f0aef..4d64209dd36 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -418,6 +418,13 @@ in normal mode."
   :group 'calc
   :type 'boolean)
 
+(defcustom calc-ensure-consistent-units
+  nil
+  "If non-nil, make sure new units are consistent with current units
+when converting units."
+  :group 'calc
+  :type 'boolean)
+
 (defcustom calc-undo-length
   100
   "The number of undo steps that will be preserved when Calc is quit."