mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

(Calendar Customizing): Mention whitespace variables and intermonth text.

Browse Source 
(Holiday Customizing): Add holiday-chinese.
This commit is contained in:
Glenn Morris 2008-08-10 01:51:23 +00:00
parent 5c94b31cbc
commit a43a8a2e81
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/emacs/ChangeLog
View File

@ -1,3 +1,9 @@
2008-08-10 Glenn Morris <rgm@gnu.org>
* cal-xtra.texi (Calendar Customizing): Mention whitespace variables
and intermonth text.
(Holiday Customizing): Add holiday-chinese.
2008-08-08 Eli Zaretskii <eliz@gnu.org>
* files.texi (Log Buffer, Diff Mode): Fix last changes. Add indexing.

20
doc/emacs/cal-xtra.texi
View File

@ -27,6 +27,21 @@ diary suit your personal tastes.
@node Calendar Customizing
@subsection Customizing the Calendar
@vindex calendar-intermonth-text
@cindex calendar layout
@cindex showing week numbers in the calendar
The layout of the calendar is to some extent customizable. The
display is unfortunately limited to three months (due to some
deep-rooted and widespread assumptions in the code), but you can
customize the whitespace used in the display by setting the variables:
@code{calendar-left-margin}, @code{calendar-intermonth-spacing},
@code{calendar-column-width}, @code{calendar-day-header-width}, and
@code{calendar-day-digit-width}. To display text between the months,
for example week numbers, customize the variables
@code{calendar-intermonth-header} and @code{calendar-intermonth-text} as
described in their documentation.
@vindex calendar-holiday-marker
@vindex diary-entry-marker
The variable @code{calendar-holiday-marker} specifies how to mark a
@ -159,6 +174,9 @@ The @var{k}th @var{dayname} in @var{month} on the Gregorian calendar
(@var{dayname}=0 for Sunday, and so on); negative @var{k} means count back
from the end of the month.
@item (holiday-chinese @var{month} @var{day} @var{string})
A fixed date on the Chinese calendar.
@item (holiday-hebrew @var{month} @var{day} @var{string})
A fixed date on the Hebrew calendar.
@ -210,7 +228,7 @@ the month (1 specifies the first occurrence, 2 the second occurrence,
so on).
You can specify holidays that occur on fixed days of the Baha'i,
Hebrew, Islamic, and Julian calendars too. For example,
Chinese, Hebrew, Islamic, and Julian calendars too. For example,
@smallexample
(setq other-holidays

4
etc/NEWS
View File

@ -614,17 +614,21 @@ prefixes, eg `calendar-french-'. The old names you are likely to use
directly still exist, for the time being, as aliases, but please start
using the new names.
+++
*** The whitespace in the calendar layout can be customized.
See the variables:
calendar-left-margin, calendar-intermonth-spacing, calendar-column-width,
calendar-day-header-width, and calendar-day-digit-width.
+++
*** Text (e.g. ISO weeks) can be displayed between the calendar months.
See the variables calendar-intermonth-header and calendar-intermonth-text.
+++
*** The function `holiday-chinese' computes holidays on the Chinese calendar.
It has been used to add items to the list `holiday-oriental-holidays'.
---
*** `diary-remind' accepts a negative number -DAYS as a shorthand for
the list (1 2 ... DAYS).