From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Mon, 10 Jan 2005 16:54:15 +0000 (+0000)
Subject: (calc-reset): Don't adjust the window height if the window takes up
X-Git-Tag: ttn-vms-21-2-B4~2829
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=24193b8ddfeffe9a8bfc8f6756e522061ce79dc0;p=emacs.git

(calc-reset): Don't adjust the window height if the window takes up
the whole height of the frame.
---

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))))
   (calc-wrapper
    (let ((win (get-buffer-window (current-buffer))))
      (calc-realign 0)
-     (if win
+     ;; Adjust the window height if the window is visible, but doesn't
+     ;; take up the whole height of the frame.
+     (if (and
+          win
+          (< (window-height win) (1- (frame-height))))
 	 (let ((height (- (window-height win) 2)))
 	   (set-window-point win (point))
 	   (or (= height calc-window-height)