aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/calendar/calendar.el
diff options
context:
space:
mode:
authorMiles Bader <[email protected]>2000-11-22 09:06:14 +0000
committerMiles Bader <[email protected]>2000-11-22 09:06:14 +0000
commit317545188ae79477955a2ca2f4e5667ff4332d93 (patch)
treefac07552b96a6232b6f4677b7a0118c9e7a7fc48 /lisp/calendar/calendar.el
parent3a17d6cc197a86bf8a34839e42db99bacdb6d0fe (diff)
(generate-calendar-window): When we don't call `fit-window-to-buffer',
make sure the top line is fully visible.
Diffstat (limited to 'lisp/calendar/calendar.el')
-rw-r--r--lisp/calendar/calendar.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 33e3e0a98d..4ad4d406f4 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1798,8 +1798,11 @@ 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)
- (unless (or (one-window-p t)
- (/= (frame-width) (window-width)))
+ (if (or (one-window-p t) (/= (frame-width) (window-width)))
+ ;; Don't mess with the window size, but ensure that the first
+ ;; line is fully visible
+ (set-window-vscroll nil 0)
+ ;; Adjust the window to exactly fit the displayed calendar
(fit-window-to-buffer))
(sit-for 0)
(and mark-holidays-in-calendar