aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-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 @@
12012-07-27 Jay Belanger <jay.p.belanger@gmail.com>
2
3 * calc/calccomp.el (math-compose-expr): Undo previous change.
4
12012-07-27 Fabián Ezequiel Gallina <fgallina@cuca> 52012-07-27 Fabián Ezequiel Gallina <fgallina@cuca>
2 6
3 * progmodes/python.el (python-mode-map): Added keybinding for 7 * 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 @@
87 sn))) 87 sn)))
88 88
89(defun math-compose-expr (a prec) 89(defun math-compose-expr (a prec)
90 (let ((calc-multiplication-has-precedence nil) 90 (let ((math-compose-level (1+ math-compose-level))
91 (math-compose-level (1+ math-compose-level))
92 (math-expr-opers (math-expr-ops)) 91 (math-expr-opers (math-expr-ops))
93 spfn) 92 spfn)
94 (cond 93 (cond