aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2005-01-10 16:54:15 +0000
committerJay Belanger2005-01-10 16:54:15 +0000
commit24193b8ddfeffe9a8bfc8f6756e522061ce79dc0 (patch)
treec88e14e9999ab172b9ea8f2de1a6e1104e0e44f9
parentdc91a0ed800ec66f7bdcdd67e59b8565fd52be45 (diff)
downloademacs-24193b8ddfeffe9a8bfc8f6756e522061ce79dc0.tar.gz
emacs-24193b8ddfeffe9a8bfc8f6756e522061ce79dc0.zip
(calc-reset): Don't adjust the window height if the window takes up
the whole height of the frame.
-rw-r--r--lisp/calc/calc-ext.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 80e801ab2b7..2806db82b13 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -1263,7 +1263,11 @@ calc-kill calc-kill-region calc-yank))))
1263 (calc-wrapper 1263 (calc-wrapper
1264 (let ((win (get-buffer-window (current-buffer)))) 1264 (let ((win (get-buffer-window (current-buffer))))
1265 (calc-realign 0) 1265 (calc-realign 0)
1266 (if win 1266 ;; Adjust the window height if the window is visible, but doesn't
1267 ;; take up the whole height of the frame.
1268 (if (and
1269 win
1270 (< (window-height win) (1- (frame-height))))
1267 (let ((height (- (window-height win) 2))) 1271 (let ((height (- (window-height win) 2)))
1268 (set-window-point win (point)) 1272 (set-window-point win (point))
1269 (or (= height calc-window-height) 1273 (or (= height calc-window-height)