Commit 571388b0 authored by Glenn Morris's avatar Glenn Morris
Browse files

Update for `calendar-date-style' replacing `european-calendar'.

parent b54eb584
2008-03-29 Glenn Morris <rgm@gnu.org>
* calendar.texi: Update for `calendar-date-style' replacing
`european-calendar'.
2008-03-28 Chong Yidong <cyd@stupidchicken.com> 2008-03-28 Chong Yidong <cyd@stupidchicken.com>
* mark.texi (Mark): Rearrange nodes. * mark.texi (Mark): Rearrange nodes.
......
...@@ -1196,7 +1196,7 @@ the entire file with @kbd{s} (@code{diary-show-all-entries}). ...@@ -1196,7 +1196,7 @@ the entire file with @kbd{s} (@code{diary-show-all-entries}).
Here are some sample diary entries, illustrating different ways of Here are some sample diary entries, illustrating different ways of
formatting a date. The examples all show dates in American order formatting a date. The examples all show dates in American order
(month, day, year), but Calendar mode supports European order (day, (month, day, year), but Calendar mode supports European order (day,
month, year) as an option. month, year) and ISO order (year, month, day) as options.
@example @example
4/20/93 Switch-over to new tabulation system 4/20/93 Switch-over to new tabulation system
...@@ -1234,18 +1234,14 @@ this matches any month, day, or year, respectively. Thus, a diary entry ...@@ -1234,18 +1234,14 @@ this matches any month, day, or year, respectively. Thus, a diary entry
@samp{3/*/*} matches any day in March of any year; so does @samp{march @samp{3/*/*} matches any day in March of any year; so does @samp{march
*}. *}.
@vindex european-calendar-style @vindex calendar-date-style
@findex european-calendar @findex calendar-set-date-style
@findex american-calendar If you prefer the European style of writing dates (in which the day
If you prefer the European style of writing dates---in which the day comes before the month), or the ISO style (in which the order is year,
comes before the month---type @kbd{M-x european-calendar} while in the month, day), type @kbd{M-x calendar-set-date-style} while in the
calendar, or set the variable @code{european-calendar-style} to @code{t} calendar, or customize the variable @code{calendar-date-style}. This
with @kbd{M-x customize}, or @emph{before} using any calendar or diary affects how diary dates are interpreted, date display, and the order in
command. This mode interprets all dates in the diary in the European which some commands expect their arguments to be given.
manner, and also uses European style for displaying diary dates. (Note
that there is no comma after the @var{monthname} in the European style.)
To go back to the (default) American style of writing dates, type
@kbd{M-x american-calendar}.
You can use the name of a day of the week as a generic date which You can use the name of a day of the week as a generic date which
applies to any date falling on that day of the week. You can abbreviate applies to any date falling on that day of the week. You can abbreviate
...@@ -1341,10 +1337,10 @@ entry. The entry looks like this: ...@@ -1341,10 +1337,10 @@ entry. The entry looks like this:
@noindent @noindent
This entry applies to October 31 in any year after 1948; @samp{10 31 This entry applies to October 31 in any year after 1948; @samp{10 31
1948} specifies the date. (If you are using the European calendar 1948} specifies the date. (If you are using the European or ISO
style, the month and day are interchanged.) The reason this expression calendar style, the input order of month, day and year is different.)
requires a beginning year is that advanced diary functions can use it to The reason this expression requires a beginning year is that advanced
calculate the number of elapsed years. diary functions can use it to calculate the number of elapsed years.
A @dfn{block} diary entry applies to a specified range of consecutive A @dfn{block} diary entry applies to a specified range of consecutive
dates. Here is a block diary entry that applies to all dates from June dates. Here is a block diary entry that applies to all dates from June
...@@ -1357,8 +1353,8 @@ dates. Here is a block diary entry that applies to all dates from June ...@@ -1357,8 +1353,8 @@ dates. Here is a block diary entry that applies to all dates from June
@noindent @noindent
The @samp{6 24 1990} indicates the starting date and the @samp{7 10 1990} The @samp{6 24 1990} indicates the starting date and the @samp{7 10 1990}
indicates the stopping date. (Again, if you are using the European calendar indicates the stopping date. (Again, if you are using the European or ISO
style, the month and day are interchanged.) calendar style, the input order of month, day and year is different.)
@kindex i b @r{(Calendar mode)} @kindex i b @r{(Calendar mode)}
@findex insert-block-diary-entry @findex insert-block-diary-entry
...@@ -1382,7 +1378,8 @@ which looks like this: ...@@ -1382,7 +1378,8 @@ which looks like this:
@noindent @noindent
This entry applies to March 1, 1990 and every 50th day following; This entry applies to March 1, 1990 and every 50th day following;
@samp{3 1 1990} specifies the starting date. (If you are using the @samp{3 1 1990} specifies the starting date. (If you are using the
European calendar style, the month and day are interchanged.) European or ISO calendar style, the input order of month, day and year
is different.)
All three of these commands make marking diary entries. To insert a All three of these commands make marking diary entries. To insert a
nonmarking entry, give a numeric argument to the command. For example, nonmarking entry, give a numeric argument to the command. For example,
......
...@@ -532,6 +532,7 @@ file copy is checked via the file's checksum. ...@@ -532,6 +532,7 @@ file copy is checked via the file's checksum.
** Calendar and diary ** Calendar and diary
+++
*** There is a new date style, `iso', essentially year/month/day. *** There is a new date style, `iso', essentially year/month/day.
The variable `european-calendar-style' is obsolete - use `calendar-date-style'. The variable `european-calendar-style' is obsolete - use `calendar-date-style'.
Similarly, the commands `american-calendar' and `european-calendar' Similarly, the commands `american-calendar' and `european-calendar'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment