summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Belanger <jay.p.belanger@gmail.com>2012-07-27 10:05:13 -0500
committerJay Belanger <jay.p.belanger@gmail.com>2012-07-27 10:05:13 -0500
commite827b1eb40c21fc9b3f1398cd413c8d0c3daa903 (patch)
treefd66d594d82a79d062bbc7673e64227e577ec652
parenta90dfb95112ebff530ec5c7167c1402b10c2e49b (diff)
downloademacs-e827b1eb40c21fc9b3f1398cd413c8d0c3daa903.tar.gz
calccomp.el (math-compose-expr): Undo previous change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/calc/calccomp.el3
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7401546c6d4..5bd1056f560 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-27 Jay Belanger <jay.p.belanger@gmail.com>
+
+ * calc/calccomp.el (math-compose-expr): Undo previous change.
+
2012-07-27 Fabián Ezequiel Gallina <fgallina@cuca>
* progmodes/python.el (python-mode-map): Added keybinding for
diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index 73e745bcf75..d8ad7e2cede 100644
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -87,8 +87,7 @@
sn)))
(defun math-compose-expr (a prec)
- (let ((calc-multiplication-has-precedence nil)
- (math-compose-level (1+ math-compose-level))
+ (let ((math-compose-level (1+ math-compose-level))
(math-expr-opers (math-expr-ops))
spfn)
(cond