diff options
| author | Glenn Morris | 2014-09-07 22:57:24 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-09-07 22:57:24 -0700 |
| commit | 6e82d877a4a59feb4390baeb2ccc57e7cd03593d (patch) | |
| tree | e5757c7407c67d6906c3e5760a79312575544cac /lisp/ChangeLog | |
| parent | 938aed6ef8c0f6ad609c791b1549580b261a5f12 (diff) | |
| download | emacs-6e82d877a4a59feb4390baeb2ccc57e7cd03593d.tar.gz emacs-6e82d877a4a59feb4390baeb2ccc57e7cd03593d.zip | |
* calendar.el (calendar-basic-setup): Avoid clobbering calendar with diary.
Fixes: debbugs:18381
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 504657358f1..2bd234e12e0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-09-08 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * calendar/calendar.el (calendar-basic-setup): | ||
| 4 | Avoid clobbering calendar with diary. (Bug#18381) | ||
| 5 | |||
| 1 | 2014-09-05 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-09-05 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * vc/vc-dir.el (vc-dir-update): Don't burp in corner case. | 8 | * vc/vc-dir.el (vc-dir-update): Don't burp in corner case. |