diff options
| author | Glenn Morris <[email protected]> | 2007-11-24 21:53:02 +0000 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2007-11-24 21:53:02 +0000 |
| commit | cb6c237a6f3444bebe104f59ae6502fad7dca8da (patch) | |
| tree | f51937b274ee2b95285bf6ae600884d2d8ec658f | |
| parent | 40f79f5b3c95ea15758d6cd58669860fe2d00d2b (diff) | |
(appt-disp-window): Restore a simplified version of
minibuffer-avoidance code deleted in previous change.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/calendar/appt.el | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b8232d9807..0873acd70a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,8 @@ 2007-11-24 Glenn Morris <[email protected]> * 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 0c8b9b1918..c605cbef10 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))) |