Mercurial > emacs

changeset 86420:b245f4378114

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 3bf867697670
children ad95f9479040
files lisp/calendar/appt.el
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/calendar/appt.el	Sat Nov 24 21:40:02 2007 +0000
+++ b/lisp/calendar/appt.el	Sat Nov 24 21:52:43 2007 +0000
@@ -436,6 +436,11 @@
   "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)))