X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4946337df63e1f4c7fc242230d791bb691cf7756..c5c927519c95b69cf998228a975c66e0d75d3215:/man/calendar.texi diff --git a/man/calendar.texi b/man/calendar.texi index 8b0d33bafc..3b06d30fef 100644 --- a/man/calendar.texi +++ b/man/calendar.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,1997,2000 Free Software Foundation, Inc. +@c Copyright (C) 1985,86,87,93,94,95,1997,2000,2001 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Calendar/Diary, Gnus, Dired, Top @chapter The Calendar and the Diary @@ -210,11 +210,11 @@ then centers the three-month calendar around that month. @section Scrolling in the Calendar @cindex scrolling in the calendar - The calendar display scrolls automatically through time when you move out -of the visible portion. You can also scroll it manually. Imagine that the -calendar window contains a long strip of paper with the months on it. -Scrolling it means moving the strip so that new months become visible in -the window. + The calendar display scrolls automatically through time when you +move out of the visible portion. You can also scroll it manually. +Imagine that the calendar window contains a long strip of paper with +the months on it. Scrolling the calendar means moving the strip +horizontally, so that new months become visible in the window. @table @kbd @item C-x < @@ -269,7 +269,7 @@ Display the number of days in the current region @kindex M-= @r{(Calendar mode)} @findex calendar-count-days-region To determine the number of days in the region, type @kbd{M-=} -(@code{calendar-count-days-region}). The numbers of days printed is +(@code{calendar-count-days-region}). The numbers of days shown is @emph{inclusive}; that is, it includes the days specified by mark and point. @@ -290,7 +290,7 @@ Exit from calendar (@code{exit-calendar}). @kindex p d @r{(Calendar mode)} @cindex day of year @findex calendar-print-day-of-year - To print the number of days elapsed since the start of the year, or + To display the number of days elapsed since the start of the year, or the number of days remaining in the year, type the @kbd{p d} command (@code{calendar-print-day-of-year}). This displays both of those numbers in the echo area. The number of days elapsed includes the @@ -468,7 +468,7 @@ times of sunrise and sunset for any date. @item S Display times of sunrise and sunset for the selected date (@code{calendar-sunrise-sunset}). -@item Mouse-2 Sunrise/Sunset +@item Mouse-2 Sunrise/sunset Display times of sunrise and sunset for the date you click on. @item M-x sunrise-sunset Display times of sunrise and sunset for today's date. @@ -482,7 +482,7 @@ Display times of sunrise and sunset for a specified date. Within the calendar, to display the @emph{local times} of sunrise and sunset in the echo area, move point to the date you want, and type @kbd{S}. Alternatively, click @kbd{Mouse-2} on the date, then choose -@kbd{Sunrise/Sunset} from the menu that appears. The command @kbd{M-x +@samp{Sunrise/sunset} from the menu that appears. The command @kbd{M-x sunrise-sunset} is available outside the calendar to display this information for today's date or a specified date. To specify a date other than today, use @kbd{C-u M-x sunrise-sunset}, which prompts for @@ -680,7 +680,7 @@ repeated in a cycle of sixty. in various other calendar systems: @table @kbd -@item Mouse-2 Other Calendars +@item Mouse-2 Other calendars Display the date that you click on, expressed in various other calendars. @kindex p @r{(Calendar mode)} @findex calendar-print-iso-date @@ -727,14 +727,15 @@ Display Mayan date for selected day (@code{calendar-print-mayan-date}). If you are using X, the easiest way to translate a date into other calendars is to click on it with @kbd{Mouse-2}, then choose @kbd{Other -Calendars} from the menu that appears. This displays the equivalent +calendars} from the menu that appears. This displays the equivalent forms of the date in all the calendars Emacs understands, in the form of a menu. (Choosing an alternative from this menu doesn't actually do anything---the menu is used only for display.) - Put point on the desired date of the Gregorian calendar, then type the -appropriate keys. The @kbd{p} is a mnemonic for ``print'' since Emacs -``prints'' the equivalent date in the echo area. + Otherwise, move point to the date you want to convert, then type the +appropriate command starting with @kbd{p} from the table above. The +prefix @kbd{p} is a mnemonic for ``print,'' since Emacs ``prints'' the +equivalent date in the echo area. @node From Other Calendar @subsection Converting From Other Calendars @@ -762,7 +763,7 @@ Move to a date specified in the ISO commercial calendar Move to a date specified in the Julian calendar (@code{calendar-goto-julian-date}). @item g a -Move to a date specified in astronomical (Julian) day number +Move to a date specified with an astronomical (Julian) day number (@code{calendar-goto-astro-day-number}). @item g h Move to a date specified in the Hebrew calendar @@ -973,8 +974,8 @@ it shows all the diary entries for that many successive days. Thus, following day. Another way to display the diary entries for a date is to click -@kbd{Mouse-2} on the date, and then choose @kbd{Diary} from the menu -that appears. +@kbd{Mouse-2} on the date, and then choose @kbd{Diary entries} from +the menu that appears. @kindex m @r{(Calendar mode)} @findex mark-diary-entries @@ -1177,9 +1178,9 @@ date; you can then type the rest of the diary entry. the week, select that day of the week (any occurrence will do) and type @kbd{i w}. This inserts the day-of-week as a generic date; you can then type the rest of the diary entry. You can make a monthly diary entry in -the same fashion. Select the day of the month, use the @kbd{i m} -command, and type rest of the entry. Similarly, you can insert a yearly -diary entry with the @kbd{i y} command. +the same fashion: select the day of the month, use the @kbd{i m} +command, and type the rest of the entry. Similarly, you can insert a +yearly diary entry with the @kbd{i y} command. All of the above commands make marking diary entries by default. To make a nonmarking diary entry, give a numeric argument to the command. @@ -1302,17 +1303,20 @@ the 11 above to @samp{'(1 2 3)} and have the entry apply to the last Thursday of January, February, and March. If the month is @code{t}, the entry applies to all months of the year.@refill - Most generally, sexp diary entries can perform arbitrary -computations to determine when they apply. @xref{Sexp Diary Entries,, -Sexp Diary Entries, elisp, The Emacs Lisp Reference Manual}. + Each of the standard sexp diary entries takes an optional parameter +specifying the name of a face or a single-character string to use when +marking the entry in the calendar. Most generally, sexp diary entries +can perform arbitrary computations to determine when they apply. +@xref{Sexp Diary Entries,, Sexp Diary Entries, elisp, The Emacs Lisp +Reference Manual}. @node Appointments @section Appointments @cindex appointment notification If you have a diary entry for an appointment, and that diary entry -begins with a recognizable time of day, Emacs can warn you, several -minutes beforehand, that that appointment is pending. Emacs alerts you +begins with a recognizable time of day, Emacs can warn you several +minutes beforehand that that appointment is pending. Emacs alerts you to the appointment by displaying a message in the mode line. @vindex diary-hook @@ -1482,7 +1486,7 @@ tells Emacs that the current interval is over. @cindex @file{.timelog} file @vindex timeclock-file @findex timeclock-reread-log - The timeclock functions work by accumulating the data on a file + The timeclock functions work by accumulating the data in a file called @file{.timelog} in your home directory. (On MS-DOS, this file is called @file{_timelog}, since an initial period is not allowed in file names on MS-DOS.) You can specify a different name for this file