diff options
| author | Glenn Morris | 2011-06-11 10:54:53 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-06-11 10:54:53 -0700 |
| commit | 0a2bb1a9cfcd6948d2912882b6be53574b575327 (patch) | |
| tree | 12690a3338d0715d3327174753ffa5fa397e394b /lisp/ChangeLog | |
| parent | 6198ccd0b2e8cebc14415e13765de6bb758ec786 (diff) | |
| download | emacs-0a2bb1a9cfcd6948d2912882b6be53574b575327.tar.gz emacs-0a2bb1a9cfcd6948d2912882b6be53574b575327.zip | |
Handle overlapping appointments in appt.el (bug#8377)
* lisp/calendar/appt.el (appt-disp-window-function): Doc fix.
(appt-check): Handle overlapping appointments.
* etc/NEWS: Mention appt-disp-window-function should handle lists now.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c258be6d9b..31264f720bf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-06-11 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * calendar/appt.el (appt-disp-window-function): Doc fix. | ||
| 4 | (appt-check): Handle overlapping appointments. (Bug#8337) | ||
| 5 | |||
| 1 | 2011-06-11 Martin Rudalics <rudalics@gmx.at> | 6 | 2011-06-11 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * window.el (window-tree-1, window-tree): New functions, moving | 8 | * window.el (window-tree-1, window-tree): New functions, moving |