comparison lisp/calendar/appt.el @ 86420:b245f4378114

(appt-disp-window): Restore a simplified version of minibuffer-avoidance code deleted in previous change.
author Glenn Morris <rgm@gnu.org>
date Sat, 24 Nov 2007 21:52:43 +0000
parents bbc7f9c9ad6e
children 107ccd98fa12 53108e6cea98
comparison
equal deleted inserted replaced
86419:3bf867697670 86420:b245f4378114
434 434
435 (defun appt-disp-window (min-to-app new-time appt-msg) 435 (defun appt-disp-window (min-to-app new-time appt-msg)
436 "Display appointment message APPT-MSG in a separate buffer. 436 "Display appointment message APPT-MSG in a separate buffer.
437 The appointment is due in MIN-TO-APP (a string) minutes. 437 The appointment is due in MIN-TO-APP (a string) minutes.
438 NEW-TIME is a string giving the date." 438 NEW-TIME is a string giving the date."
439 ;; Make sure we're not in the minibuffer before splitting the window.
440 ;; FIXME this seems needlessly complicated?
441 (when (minibufferp)
442 (other-window 1)
443 (and (minibufferp) (display-multi-frame-p) (other-frame 1)))
439 (let ((this-window (selected-window)) 444 (let ((this-window (selected-window))
440 (appt-disp-buf (set-buffer (get-buffer-create appt-buffer-name)))) 445 (appt-disp-buf (set-buffer (get-buffer-create appt-buffer-name))))
441 (if (cdr (assq 'unsplittable (frame-parameters))) 446 (if (cdr (assq 'unsplittable (frame-parameters)))
442 ;; In an unsplittable frame, use something somewhere else. 447 ;; In an unsplittable frame, use something somewhere else.
443 (display-buffer appt-disp-buf) 448 (display-buffer appt-disp-buf)