diff options
| author | Jay Belanger | 2012-07-27 10:05:13 -0500 |
|---|---|---|
| committer | Jay Belanger | 2012-07-27 10:05:13 -0500 |
| commit | e827b1eb40c21fc9b3f1398cd413c8d0c3daa903 (patch) | |
| tree | fd66d594d82a79d062bbc7673e64227e577ec652 | |
| parent | a90dfb95112ebff530ec5c7167c1402b10c2e49b (diff) | |
| download | emacs-e827b1eb40c21fc9b3f1398cd413c8d0c3daa903.tar.gz emacs-e827b1eb40c21fc9b3f1398cd413c8d0c3daa903.zip | |
calccomp.el (math-compose-expr): Undo previous change.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/calc/calccomp.el | 3 |
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 @@ | |||
| 1 | 2012-07-27 Jay Belanger <jay.p.belanger@gmail.com> | ||
| 2 | |||
| 3 | * calc/calccomp.el (math-compose-expr): Undo previous change. | ||
| 4 | |||
| 1 | 2012-07-27 Fabián Ezequiel Gallina <fgallina@cuca> | 5 | 2012-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 |