1 files changed, 5 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b7830f8726..ef5e5422222 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2011-05-06  Glenn Morris  <rgm@gnu.org>
 
+        * calendar/diary-lib.el (diary-comment-start, diary-comment-end):
+        New options.
+        (diary-add-to-list): Strip comments from the displayed string.
+        (diary-mode): Set comment-start and comment-end.
+
         * vc/diff-mode.el (smerge-refine-subst): Declare.
         (diff-refine-hunk): Don't require smerge-mode when compiling.