aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2008-11-24 19:53:33 +0000
committerMartin Rudalics2008-11-24 19:53:33 +0000
commit0836e2c3d7ab46a8cded7654b3acd901c0782e76 (patch)
tree91f1ce1ebbb80f301eeb63b46a1ad416e7f45829
parenta59c6c5194c546cbe613dabbe31def45eb2cfc30 (diff)
downloademacs-0836e2c3d7ab46a8cded7654b3acd901c0782e76.tar.gz
emacs-0836e2c3d7ab46a8cded7654b3acd901c0782e76.zip
(appt-disp-window): Do a set-buffer when the
frame can't be split.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calendar/appt.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d6ea22d13c..fe34317f722 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-11-24 Martin Rudalics <rudalics@gmx.at>
2
3 * calendar/appt.el (appt-disp-window): Do a set-buffer when the
4 frame can't be split.
5
12008-11-24 Ulf Jasper <ulf@web.de> 62008-11-24 Ulf Jasper <ulf@web.de>
2 7
3 * net/newst-treeview.el (newsticker--treeview-current-feed): Doc 8 * net/newst-treeview.el (newsticker--treeview-current-feed): Doc
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index fa6956687e8..878e8897edc 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -417,7 +417,9 @@ message APPT-MSG in a separate buffer."
417 (and (minibufferp) (display-multi-frame-p) (other-frame 1))) 417 (and (minibufferp) (display-multi-frame-p) (other-frame 1)))
418 (if (cdr (assq 'unsplittable (frame-parameters))) 418 (if (cdr (assq 'unsplittable (frame-parameters)))
419 ;; In an unsplittable frame, use something somewhere else. 419 ;; In an unsplittable frame, use something somewhere else.
420 (display-buffer appt-disp-buf) 420 (progn
421 (set-buffer appt-disp-buf)
422 (display-buffer appt-disp-buf))
421 (unless (or (special-display-p (buffer-name appt-disp-buf)) 423 (unless (or (special-display-p (buffer-name appt-disp-buf))
422 (same-window-p (buffer-name appt-disp-buf))) 424 (same-window-p (buffer-name appt-disp-buf)))
423 ;; By default, split the bottom window and use the lower part. 425 ;; By default, split the bottom window and use the lower part.