2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 512e83999ab..d3692e6ac7f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * calculator.el (calculator): Don't bind split-window-keep-point
+        (Bug#5674).
+
 2010-03-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * vc-git.el: Re-flow to fit into 80 columns.
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 015fb4cd763..d1b9b517e5f 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -724,8 +724,7 @@ See the documentation for `calculator-mode' for more information."
     (progn
       (cond
         ((not (get-buffer-window calculator-buffer))
-         (let ((split-window-keep-point nil)
-               (window-min-height 2))
+         (let ((window-min-height 2))
            ;; maybe leave two lines for our window because of the normal
            ;; `raised' modeline in Emacs 21
            (select-window