aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2008-08-25 20:55:05 +0000
committerJay Belanger2008-08-25 20:55:05 +0000
commit518e6a154129710eb6be4009503d77ddfb263b50 (patch)
tree9f9f06171286de2b100107c81a66efa56d2f2ac8
parente827fd3d08f58d16a49cd55a2ed8cb8c3236a513 (diff)
downloademacs-518e6a154129710eb6be4009503d77ddfb263b50.tar.gz
emacs-518e6a154129710eb6be4009503d77ddfb263b50.zip
Replace missing exponent.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calc/calc-units.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dcce8acda17..9d2089c842e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-08-25 Jay Belanger <jay.p.belanger@gmail.com>
2
3 * calc/calc-units.el (math-simplify-units-quotient): Replace
4 missing exponent.
5
12008-08-24 Romain Francoise <romain@orebokech.com> 62008-08-24 Romain Francoise <romain@orebokech.com>
2 7
3 * progmodes/python.el (run-python): Remove '' from sys.path. 8 * progmodes/python.el (run-python): Remove '' from sys.path.
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index f648a37cb7f..e3da2ebd997 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -1138,7 +1138,9 @@ Entries are (SYMBOL EXPR DOC-STRING TEMP-TYPE BASE-UNITS).")
1138 (and un ud 1138 (and un ud
1139 (if (and (equal (nth 4 un) (nth 4 ud)) 1139 (if (and (equal (nth 4 un) (nth 4 ud))
1140 (eq pow1 pow2)) 1140 (eq pow1 pow2))
1141 (math-to-standard-units (list '/ n d) nil) 1141 (if (eq pow1 1)
1142 (math-to-standard-units (list '/ n d) nil)
1143 (list '^ (math-to-standard-units (list '/ n d) nil) pow1))
1142 (let (ud1) 1144 (let (ud1)
1143 (setq un (nth 4 un) 1145 (setq un (nth 4 un)
1144 ud (nth 4 ud)) 1146 ud (nth 4 ud))