From 84032db718d3ffc643612c6e94ea9a7956675c4e Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 3 Sep 2013 15:44:02 -0400 Subject: [PATCH] * lisp/calculator.el (calculator-funcall): Fix typo in last change. --- lisp/ChangeLog | 2 ++ lisp/calculator.el | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ad5baad3ef0..9030d5da9fb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-09-03 Stefan Monnier + * calculator.el (calculator-funcall): Fix typo in last change. + * vc/vc-git.el (vc-git-checkin): Make it possible to commit a merge. * 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." ((symbol-function 'D) (lambda (x) (if calculator-deg (/ (* x 180) float-pi) x)))) (eval f `((X . ,X) - (Y . ,X) + (Y . ,Y) (TX . ,TX) (TY . ,TY) (DX . ,DX) -- 2.39.2