aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2013-09-03 15:44:02 -0400
committerStefan Monnier2013-09-03 15:44:02 -0400
commit84032db718d3ffc643612c6e94ea9a7956675c4e (patch)
tree12e1c6f9bf7631cfdbc8ad601ad3c89c554d5465
parent724f5e41b6997252209ae3c0f2d04f3d5107b38c (diff)
downloademacs-84032db718d3ffc643612c6e94ea9a7956675c4e.tar.gz
emacs-84032db718d3ffc643612c6e94ea9a7956675c4e.zip
* lisp/calculator.el (calculator-funcall): Fix typo in last change.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/calculator.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad5baad3ef0..9030d5da9fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12013-09-03 Stefan Monnier <monnier@iro.umontreal.ca> 12013-09-03 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * calculator.el (calculator-funcall): Fix typo in last change.
4
3 * vc/vc-git.el (vc-git-checkin): Make it possible to commit a merge. 5 * vc/vc-git.el (vc-git-checkin): Make it possible to commit a merge.
4 6
5 * emacs-lisp/package.el (package-activate-1): Don't let a missing 7 * emacs-lisp/package.el (package-activate-1): Don't let a missing
diff --git a/lisp/calculator.el b/lisp/calculator.el
index c988b7e1088..c4611c12d87 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -1287,7 +1287,7 @@ arguments."
1287 ((symbol-function 'D) 1287 ((symbol-function 'D)
1288 (lambda (x) (if calculator-deg (/ (* x 180) float-pi) x)))) 1288 (lambda (x) (if calculator-deg (/ (* x 180) float-pi) x))))
1289 (eval f `((X . ,X) 1289 (eval f `((X . ,X)
1290 (Y . ,X) 1290 (Y . ,Y)
1291 (TX . ,TX) 1291 (TX . ,TX)
1292 (TY . ,TY) 1292 (TY . ,TY)
1293 (DX . ,DX) 1293 (DX . ,DX)