*** calendar/appt.el.~1.92.~	2008-08-31 09:48:52.453125000 +0200
--- calendar/appt.el	2008-11-23 18:55:59.125000000 +0100
***************
*** 410,420 ****
  message APPT-MSG in a separate buffer."
    ;; Make sure we're not in the minibuffer before splitting the window.
    ;; FIXME this seems needlessly complicated?
-   (when (minibufferp)
-     (other-window 1)
-     (and (minibufferp) (display-multi-frame-p) (other-frame 1)))
    (let ((this-window (selected-window))
!         (appt-disp-buf (set-buffer (get-buffer-create appt-buffer-name))))
      (if (cdr (assq 'unsplittable (frame-parameters)))
          ;; In an unsplittable frame, use something somewhere else.
          (display-buffer appt-disp-buf)
--- 410,420 ----
  message APPT-MSG in a separate buffer."
    ;; Make sure we're not in the minibuffer before splitting the window.
    ;; FIXME this seems needlessly complicated?
    (let ((this-window (selected-window))
!         (appt-disp-buf (get-buffer-create appt-buffer-name)))
!     (when (minibufferp)
!       (other-window 1)
!       (and (minibufferp) (display-multi-frame-p) (other-frame 1)))
      (if (cdr (assq 'unsplittable (frame-parameters)))
          ;; In an unsplittable frame, use something somewhere else.
          (display-buffer appt-disp-buf)