Mercurial > emacs

diff lisp/calc/calc-units.el @ 91073:4bc33ffdda1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 902-908) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 131-137) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 261-262) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author Miles Bader <miles@gnu.org>
date Sat, 27 Oct 2007 09:12:07 +0000
parents bdb3fe0ba9fa 819d86e241bc
children c938ab6810a4
line wrap: on
line diff
--- a/lisp/calc/calc-units.el	Sat Oct 27 00:30:50 2007 +0000
+++ b/lisp/calc/calc-units.el	Sat Oct 27 09:12:07 2007 +0000
@@ -1222,7 +1222,9 @@
       (and un ud
 	   (if (and (equal (nth 4 un) (nth 4 ud))
 		    (eq pow1 pow2))
-	       (math-to-standard-units (list '/ n d) nil)
+               (if (eq pow1 1)
+                   (math-to-standard-units (list '/ n d) nil)
+                 (list '^ (math-to-standard-units (list '/ n d) nil) pow1))
 	     (let (ud1)
 	       (setq un (nth 4 un)
 		     ud (nth 4 ud))