mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 20:32:00 -08:00
Code Issues Projects Releases Wiki Activity

(appt-disp-window): Restore a simplified version of

Browse source 
minibuffer-avoidance code deleted in previous change.
This commit is contained in:
Glenn Morris 2007-11-24 21:53:02 +00:00
parent 40f79f5b3c
commit cb6c237a6f
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,8 +1,8 @@
2007-11-24 Glenn Morris <rgm@gnu.org>
* 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.

5
lisp/calendar/appt.el
View file

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