(generate-calendar-window): Use `fit-window-to-buffer'.

2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac62970ebfb..f0d261a720f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-13  Miles Bader  <miles@lsi.nec.co.jp>
+
+        * calendar/calendar.el (generate-calendar-window): Use
+        `fit-window-to-buffer'.
+
 2000-11-12  Miles Bader  <miles@gnu.org>
 
         * textmodes/flyspell.el (flyspell-mode-on): Only output welcome
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 8773cc8746b..33e3e0a98dd 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1798,9 +1798,9 @@ Or, for optional MON, YR."
     (calendar-cursor-to-visible-date
      (if today-visible today (list displayed-month 1 displayed-year)))
     (set-buffer-modified-p nil)
-    (or (one-window-p t)
-        (/= (frame-width) (window-width))
-        (shrink-window (- (window-height) 9)))
+    (unless (or (one-window-p t)
+                (/= (frame-width) (window-width)))
+      (fit-window-to-buffer))
     (sit-for 0)
     (and mark-holidays-in-calendar
          (mark-calendar-holidays)