[Emacs-diffs] Changes to emacs/man/calendar.texi [lexbind]

[Miles Bader]

Index: emacs/man/calendar.texi
diff -c emacs/man/calendar.texi:1.12.8.4 emacs/man/calendar.texi:1.12.8.5
*** emacs/man/calendar.texi:1.12.8.4    Tue Jul  6 10:23:38 2004
--- emacs/man/calendar.texi     Mon Oct 25 04:19:40 2004
***************
*** 37,42 ****
--- 37,43 ----
  * Other Calendars::     Converting dates to other calendar systems.
  * Diary::               Displaying events from your diary.
  * Appointments::      Reminders when it's time to do something.
+ * iCalendar::           Converting diary events to/from iCalendar format.
  * Daylight Savings::    How to specify when daylight savings time is active.
  * Time Intervals::      Keeping track of time intervals.
  @end menu
***************
*** 754,759 ****
--- 755,761 ----
  
  @kindex g @var{char} @r{(Calendar mode)}
  @findex calendar-goto-iso-date
+ @findex calendar-goto-iso-week
  @findex calendar-goto-julian-date
  @findex calendar-goto-astro-day-number
  @findex calendar-goto-hebrew-date
***************
*** 767,772 ****
--- 769,777 ----
  @item g c
  Move to a date specified in the ISO commercial calendar
  (@code{calendar-goto-iso-date}).
+ @item g w
+ Move to a week specified in the ISO commercial calendar
+ (@code{calendar-goto-iso-week}).
  @item g j
  Move to a date specified in the Julian calendar
  (@code{calendar-goto-julian-date}).
***************
*** 1379,1384 ****
--- 1384,1438 ----
  list without affecting your diary file.  You delete entries from the
  appointment list with @kbd{M-x appt-delete}.
  
+ @node iCalendar
+ @section iCalendar
+ @cindex iCalendar support
+ 
+   The icalendar package aims at providing an implementation of the
+ iCalendar standard, as defined in ``RFC 2445 -- Internet Calendaring and
+ Scheduling Core Object Specification (iCalendar)''.  It provides a means
+ for importing iCalendar (and the earlier vCalendar format) data into
+ Emacs diary files and vice versa.
+ 
+   Importing works for ``ordinary'' (i.e. non-recurring) events, but (at
+ present) may not work correctly (if at all) for recurring events.
+ Exporting of diary files into iCalendar files should work correctly for
+ most diary entries.  Please note that @file{icalendar.el} is work in
+ progress, so usage may evolve in future.
+ 
+   To activate the package, use @code{(require 'icalendar)}.
+ 
+ @findex icalendar-extract-ical-from-buffer
+   The command @code{icalendar-extract-ical-from-buffer} extracts
+ iCalendar data from the current buffer and adds it to your (default)
+ diary file.  This function is also suitable for automatic extraction of
+ iCalendar data; for example with the Rmail mail client one could use:
+ 
+ @example
+ (add-hook 'rmail-show-message-hook 'icalendar-extract-ical-from-buffer)
+ @end example
+ 
+ @findex icalendar-import-file
+   The command @code{icalendar-import-file} imports an iCalendar file.
+ @strong{Caution:} the contents of the target diary file are
+ @emph{deleted} by default!  It is highly recommended to use a dedicated
+ diary file for importing.  For example:
+ 
+ @example
+ (icalendar-import-file "/here/is/calendar.ics" "/there/goes/ical-diary")
+ @end example
+ 
+ @noindent
+ You can use an @code{#include} directive to add the import file contents
+ to the diary.  @xref{Fancy Diary Display,,, elisp, The Emacs Lisp
+ Reference Manual}.
+ 
+ @findex icalendar-convert-diary-to-ical
+   The command @code{icalendar-convert-diary-to-ical} exports an Emacs
+ diary file to iCalendar format.  @strong{Caution:} the contents of the
+ target file are @emph{deleted} by default!
+ 
+ 
  @node Daylight Savings
  @section Daylight Savings Time
  @cindex daylight savings time