diff options
author | Paul Eggert <[email protected]> | 2011-05-05 23:30:56 -0700 |
---|---|---|
committer | Paul Eggert <[email protected]> | 2011-05-05 23:30:56 -0700 |
commit | 8ff0ac3c78498c905a22786aa124f59d213b99a0 (patch) | |
tree | a0448dee34e826197c000ec615dd172cfb59bcc1 /doc | |
parent | 9991d78e8cd74e986a9b7625c12a43fbf7a283b3 (diff) | |
parent | 548d0a63d6212c0baef9a3d2bf0093cceb4e1136 (diff) |
Merge from mainline.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
-rw-r--r-- | doc/emacs/cal-xtra.texi | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index efe031d465..dbb274360f 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2011-05-06 Glenn Morris <[email protected]> + + * cal-xtra.texi (Fancy Diary Display): Mention diary comments. + 2011-05-02 Lars Magne Ingebrigtsen <[email protected]> * misc.texi (Emacs Server): Document `server-eval-at'. diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi index b936636403..4a51e9004f 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. |