aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1998-11-29 00:32:50 +0000
committerRichard M. Stallman1998-11-29 00:32:50 +0000
commit058961dde397e9e65f30b91837cf7bfb35df9e62 (patch)
treed0470396292f020e46a807ba074dc5cddcafd1f9
parentf49770515bd2909b1b9ab752cbd63dbd14dc29f3 (diff)
downloademacs-058961dde397e9e65f30b91837cf7bfb35df9e62.tar.gz
emacs-058961dde397e9e65f30b91837cf7bfb35df9e62.zip
(appt-disp-window): Use pop-to-buffer,
to support special-display and same-window features.
-rw-r--r--lisp/calendar/appt.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index d9e4fd0e328..62296bb9a57 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -391,12 +391,14 @@ The following variables control appointment notification:
391 (this-window (selected-window)) 391 (this-window (selected-window))
392 (appt-disp-buf (set-buffer (get-buffer-create appt-buffer-name)))) 392 (appt-disp-buf (set-buffer (get-buffer-create appt-buffer-name))))
393 393
394 (appt-select-lowest-window)
395 (if (cdr (assq 'unsplittable (frame-parameters))) 394 (if (cdr (assq 'unsplittable (frame-parameters)))
396 ;; In an unsplittable frame, use something somewhere else. 395 ;; In an unsplittable frame, use something somewhere else.
397 (display-buffer appt-disp-buf) 396 (display-buffer appt-disp-buf)
398 ;; Otherwise, split the bottom window and use the lower part. 397 (unless (or (special-display-p (buffer-name appt-disp-buf))
399 (split-window) 398 (same-window-p (buffer-name appt-disp-buf)))
399 ;; By default, split the bottom window and use the lower part.
400 (appt-select-lowest-window)
401 (split-window))
400 (pop-to-buffer appt-disp-buf)) 402 (pop-to-buffer appt-disp-buf))
401 (setq mode-line-format 403 (setq mode-line-format
402 (concat "-------------------- Appointment in " 404 (concat "-------------------- Appointment in "