Add diary comments feature.

* lisp/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.

* doc/emacs/cal-xtra.texi (Fancy Diary Display): Mention diary comments.

* etc/NEWS: Mention this.

2 files changed, 18 insertions, 0 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index efe031d465b..dbb274360fd 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-06  Glenn Morris  <rgm@gnu.org>
+
+        * cal-xtra.texi (Fancy Diary Display): Mention diary comments.
+
 2011-05-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * misc.texi (Emacs Server): Document `server-eval-at'.
diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi
index b936636403a..4a51e9004fc 100644
--- a/doc/emacs/cal-xtra.texi
+++ b/doc/emacs/cal-xtra.texi
@@ -616,6 +616,20 @@ first within each day.  Note how the sort command is placed at the end
 of the hook list, in case earlier members of the list change the order
 of the diary entries, or add items.
 
+@vindex diary-comment-start
+  You can write @samp{comments} in diary entries, by setting the
+variables @code{diary-comment-start} and @code{diary-comment-end} to
+strings that delimit comments.  The fancy display does not print
+comments.  You might want to put meta-data for the use of other packages
+(e.g. the appointment package,
+@iftex
+@pxref{Appointments,,,emacs, the Emacs Manual})
+@end iftex
+@ifnottex
+@pxref{Appointments})
+@end ifnottex
+inside comments.
+
 @vindex diary-include-string
   Your main diary file can include other files.  This permits a group of
 people to share a diary file for events that apply to all of them.