(appt-disp-window): Move minibuffer check

after binding this-window and do not set-buffer to make sure we
won't deselect the minibuffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b835ca2daed6fa8643cc0e9404eb099a5b77dae..be2350da94fbeb6fe98be3dd3202f856b722f4b6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-24  Martin Rudalics  <rudalics@gmx.at>
+
+       * calendar/appt.el (appt-disp-window): Move minibuffer check
+       after binding this-window and do not set-buffer to make sure we
+       won't deselect the minibuffer.
+
 2008-11-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * vc-hg.el (vc-hg-global-switches): Remove.

diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index d88951dba436af49eeb0d65527e22509b567fd5a..fa6956687e869c80793051778ad4dc1c0c24e6a6 100644 (file)
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -408,13 +408,13 @@ displayed in a window:
   "Display appointment due in MIN-TO-APP (a string) minutes.
 NEW-TIME is a string giving the date.  Displays the appointment
 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))))
+        (appt-disp-buf (get-buffer-create appt-buffer-name)))
+    ;; 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)))
     (if (cdr (assq 'unsplittable (frame-parameters)))
         ;; In an unsplittable frame, use something somewhere else.
         (display-buffer appt-disp-buf)