aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-03-06 13:23:23 -0500
committerChong Yidong2010-03-06 13:23:23 -0500
commita4e32226ebee93d94744cd9149a73e6b59785cd9 (patch)
treeb74b8819b4905b7cee769c6d7df184f835a23cda
parent4c83ed3d48c69e12c91a2ada2d00f4f74be2a42d (diff)
downloademacs-a4e32226ebee93d94744cd9149a73e6b59785cd9.tar.gz
emacs-a4e32226ebee93d94744cd9149a73e6b59785cd9.zip
* calculator.el (calculator): Don't bind split-window-keep-point (Bug#5674).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calculator.el3
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 @@
12010-03-06 Chong Yidong <cyd@stupidchicken.com>
2
3 * calculator.el (calculator): Don't bind split-window-keep-point
4 (Bug#5674).
5
12010-03-06 Stefan Monnier <monnier@iro.umontreal.ca> 62010-03-06 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * vc-git.el: Re-flow to fit into 80 columns. 8 * 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."
724 (progn 724 (progn
725 (cond 725 (cond
726 ((not (get-buffer-window calculator-buffer)) 726 ((not (get-buffer-window calculator-buffer))
727 (let ((split-window-keep-point nil) 727 (let ((window-min-height 2))
728 (window-min-height 2))
729 ;; maybe leave two lines for our window because of the normal 728 ;; maybe leave two lines for our window because of the normal
730 ;; `raised' modeline in Emacs 21 729 ;; `raised' modeline in Emacs 21
731 (select-window 730 (select-window