diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2008-11-24 09:51:26 +0000 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2008-11-24 09:51:26 +0000 |
| commit | bc5777c13fc72b7bac4ee580b658149880ad29f0 (patch) | |
| tree | a4b98a3e72f79423e53e596b1f71f120e506be42 /lisp | |
| parent | c0203c8658c319a0a54cdb7d101b3240a8d39fff (diff) | |
| download | emacs-bc5777c13fc72b7bac4ee580b658149880ad29f0.tar.gz | |
(appt-disp-window): Move minibuffer check
after binding this-window and do not set-buffer to make sure we
won't deselect the minibuffer.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/calendar/appt.el | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7b835ca2dae..be2350da94f 100644 --- 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 d88951dba43..fa6956687e8 100644 --- 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) |