aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2005-02-27 20:32:53 +0000
committerGlenn Morris2005-02-27 20:32:53 +0000
commit1536b3f78794733655411cfebc775afe6e6a1df6 (patch)
tree632a2d620d5f597829ec8cec8358236644290d8e
parent261b7f303e32868a0bd86e3d83d9a14226f118c6 (diff)
downloademacs-1536b3f78794733655411cfebc775afe6e6a1df6.tar.gz
emacs-1536b3f78794733655411cfebc775afe6e6a1df6.zip
From Matt Hodges <MPHodges@member.fsf.org>:
(General Calendar): Document binding of scroll-other-window-down. (Mayan Calendar): Fix earliest date. (Time Intervals): Document timeclock-change. Fix timeclock-ask-before-exiting documentation.
-rw-r--r--man/calendar.texi33
1 files changed, 20 insertions, 13 deletions
diff --git a/man/calendar.texi b/man/calendar.texi
index ba4b582bbec..bbbeec53017 100644
--- a/man/calendar.texi
+++ b/man/calendar.texi
@@ -291,7 +291,9 @@ Display day-in-year (@code{calendar-print-day-of-year}).
291@item C-c C-l 291@item C-c C-l
292Regenerate the calendar window (@code{redraw-calendar}). 292Regenerate the calendar window (@code{redraw-calendar}).
293@item SPC 293@item SPC
294Scroll the next window (@code{scroll-other-window}). 294Scroll the next window up (@code{scroll-other-window}).
295@item DEL
296Scroll the next window down (@code{scroll-other-window-down}).
295@item q 297@item q
296Exit from calendar (@code{exit-calendar}). 298Exit from calendar (@code{exit-calendar}).
297@end table 299@end table
@@ -314,8 +316,9 @@ non-Calendar-mode editing commands.)
314 316
315@kindex SPC @r{(Calendar mode)} 317@kindex SPC @r{(Calendar mode)}
316 In Calendar mode, you can use @kbd{SPC} (@code{scroll-other-window}) 318 In Calendar mode, you can use @kbd{SPC} (@code{scroll-other-window})
317to scroll the other window. This is handy when you display a list of 319and @kbd{DEL} (@code{scroll-other-window-down}) to scroll the other
318holidays or diary entries in another window. 320window up or down, respectively. This is handy when you display a list
321of holidays or diary entries in another window.
319 322
320@kindex q @r{(Calendar mode)} 323@kindex q @r{(Calendar mode)}
321@findex exit-calendar 324@findex exit-calendar
@@ -437,8 +440,8 @@ marks, type @kbd{u}, which also erases any diary marks (@pxref{Diary}).
437@findex list-calendar-holidays 440@findex list-calendar-holidays
438 To get even more detailed information, use the @kbd{a} command, which 441 To get even more detailed information, use the @kbd{a} command, which
439displays a separate buffer containing a list of all holidays in the 442displays a separate buffer containing a list of all holidays in the
440current three-month range. You can use @key{SPC} in the calendar window 443current three-month range. You can use @key{SPC} and @key{DEL} in the
441to scroll that list. 444calendar window to scroll that list up and down, respectively.
442 445
443@findex holidays 446@findex holidays
444 The command @kbd{M-x holidays} displays the list of holidays for the 447 The command @kbd{M-x holidays} displays the list of holidays for the
@@ -861,7 +864,7 @@ The @dfn{long count} is a counting of days with these units:
861@noindent 864@noindent
862Thus, the long count date 12.16.11.16.6 means 12 baktun, 16 katun, 11 865Thus, the long count date 12.16.11.16.6 means 12 baktun, 16 katun, 11
863tun, 16 uinal, and 6 kin. The Emacs calendar can handle Mayan long 866tun, 16 uinal, and 6 kin. The Emacs calendar can handle Mayan long
864count dates as early as 7.17.18.13.1, but no earlier. When you use the 867count dates as early as 7.17.18.13.3, but no earlier. When you use the
865@kbd{g m l} command, type the Mayan long count date with the baktun, 868@kbd{g m l} command, type the Mayan long count date with the baktun,
866katun, tun, uinal, and kin separated by periods. 869katun, tun, uinal, and kin separated by periods.
867 870
@@ -1510,11 +1513,14 @@ instance) keep track of how much time you spend working.
1510 1513
1511@findex timeclock-in 1514@findex timeclock-in
1512@findex timeclock-out 1515@findex timeclock-out
1516@findex timeclock-change
1513@findex timeclock-workday-remaining 1517@findex timeclock-workday-remaining
1514@findex timeclock-when-to-leave 1518@findex timeclock-when-to-leave
1515 Use the @kbd{M-x timeclock-in} command when you start working on a 1519 Use the @kbd{M-x timeclock-in} command when you start working on a
1516project, and @kbd{M-x timeclock-out} command when you're done. Each 1520project, and @kbd{M-x timeclock-out} command when you're done. Each
1517time you do this, it adds one time interval to the record of the project. 1521time you do this, it adds one time interval to the record of the
1522project. You can change to working on a different project with @kbd{M-x
1523timeclock-change}.
1518 1524
1519 Once you've collected data from a number of time intervals, you can use 1525 Once you've collected data from a number of time intervals, you can use
1520@kbd{M-x timeclock-workday-remaining} to see how much time is left to 1526@kbd{M-x timeclock-workday-remaining} to see how much time is left to
@@ -1529,12 +1535,13 @@ workday in the mode line, either customize the
1529@code{t}, or invoke the @kbd{M-x timeclock-modeline-display} command. 1535@code{t}, or invoke the @kbd{M-x timeclock-modeline-display} command.
1530 1536
1531@vindex timeclock-ask-before-exiting 1537@vindex timeclock-ask-before-exiting
1532 Terminating the current Emacs session might or might not mean that 1538 Terminating the current Emacs session might or might not mean that you
1533you have stopped working on the project. If you'd like Emacs to ask 1539have stopped working on the project and, by default, Emacs queries this.
1534you about this, set the value of the variable 1540You can, however, set the value of the variable
1535@code{timeclock-ask-before-exiting} to @code{t} (via @kbd{M-x 1541@code{timeclock-ask-before-exiting} to @code{nil} (via @kbd{M-x
1536customize}). By default, only an explicit @kbd{M-x timeclock-out} 1542customize}) to avoid this behaviour; then, only an explicit @kbd{M-x
1537tells Emacs that the current interval is over. 1543timeclock-out} or @kbd{M-x timeclock-change} will tell Emacs that the
1544current interval is over.
1538 1545
1539@cindex @file{.timelog} file 1546@cindex @file{.timelog} file
1540@vindex timeclock-file 1547@vindex timeclock-file