2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8232d98073..0873acd70a2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,8 @@
 2007-11-24  Glenn Morris  <rgm@gnu.org>
 
         * calendar/appt.el: Remove leading `*' from defcustom doc-strings.
-        (appt-disp-window): Don't require electric.  Remove
-        minibuffer-avoidance code, since appt-select-lowest-window does that.
+        (appt-disp-window): Don't require electric.  Simplify
+        minibuffer-avoidance code.
         (appt-select-lowest-window): Avoid minibuffer.
 
         * eshell/eshell.el: Remove leading `*' from defcustom doc-strings.
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 0c8b9b19188..c605cbef10d 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -436,6 +436,11 @@ displayed in a window:
   "Display appointment message APPT-MSG in a separate buffer.
 The appointment is due in MIN-TO-APP (a string) minutes.
 NEW-TIME is a string giving the date."
+  ;; 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)))