mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-20 18:17:20 +00:00
Code Issues Releases Activity

(appt-disp-window): Move minibuffer check

Browse Source 
after binding this-window and do not set-buffer to make sure we
won't deselect the minibuffer.
This commit is contained in:
Martin Rudalics 2008-11-24 09:51:26 +00:00
parent c0203c8658
commit bc5777c13f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -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.

12
lisp/calendar/appt.el
View File

@ -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)