Calc broken in Emacs unicode-2 branch

[Leo]

Hi,

Trying units conversion in (info "(calc)Demonstration of Calc"), I hit
an error like this,

,----
| Debugger entered--Lisp error: (error "Format error in definition of mfi in 
units table: Expected a number")
|   signal(error ("Format error in definition of mfi in units table: Expected a 
number"))
|   byte-code("address@hidden@;address@hidden"ƒÂÅ!ˆ‚'address@hidden"ˆÆ‡" [err 
calc-aborted-prefix error string-match "max-specpdl-size\\|max-lisp-eval-depth" 
"Computation got stuck or ran too long.  Type `M' to increase the limit" nil 
signal] 3)
|   calc-do(#[nil 
"ÆÇ!ȉ‰ÉÊ\"„H\f†3ËÌ!‰͚ƒ%Îǂ3ÏÐ\n\"ƒ0Î\nPÑ\n!‰¢Ò=ƒBÒÓ
address@hidden"ˆÔ
\")„]Ë\nƒYÌ\nÕQ‚ZÖ!ÏÐ\"ƒkÎPÑ!‰¢Ò=ƒ~ÒÓ×8\"ˆÉÊ\"address@hidden
 address@hidden"!#‚¿  „¯ÒÝ!ˆÙÇÚÞ\n…½\nΚ?##.‡" [units unew uoldname expr 
old-units uold calc-top-n 1 nil math-units-in-expr-p t read-string "Old units: 
" "" "1" string-match "\\` */" math-read-expr error "Bad format in units 
expression: %s" math-mul ", new units: " "New units: " 2 var calc-enter-result 
"cvun" math-simplify-units math-to-standard-units "No units specified" 
math-convert-units new-units math-standard-units-systems std] 9] 87)
|   calc-convert-units()
|   call-interactively(calc-convert-units)
`----

*NB* This error only happens in emacs-unicode-2 branch.

-- 
Leo <sdl.web AT gmail.com>                         (GPG Key: 9283AA3F)