Mercurial > emacs
changeset 99863:6638c3736a32
(appt-disp-window): Move minibuffer check
after binding this-window and do not set-buffer to make sure we
won't deselect the minibuffer.
| author | Martin Rudalics <rudalics@gmx.at> |
|---|---|
| date | Mon, 24 Nov 2008 09:50:49 +0000 |
| parents | 83ae2ae7a4c4 |
| children | b869b68b946d |
| files | lisp/calendar/appt.el |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/appt.el Mon Nov 24 09:28:49 2008 +0000 +++ b/lisp/calendar/appt.el Mon Nov 24 09:50:49 2008 +0000 @@ -408,13 +408,13 @@ "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)