From a43a8a2e815da1aa665e67b229d438259890fc32 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 10 Aug 2008 01:51:23 +0000 Subject: [PATCH] (Calendar Customizing): Mention whitespace variables and intermonth text. (Holiday Customizing): Add holiday-chinese. --- doc/emacs/ChangeLog | 6 ++++++ doc/emacs/cal-xtra.texi | 20 +++++++++++++++++++- etc/NEWS | 4 ++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 703974c1362..280aceeb569 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,9 @@ +2008-08-10 Glenn Morris + + * cal-xtra.texi (Calendar Customizing): Mention whitespace variables + and intermonth text. + (Holiday Customizing): Add holiday-chinese. + 2008-08-08 Eli Zaretskii * files.texi (Log Buffer, Diff Mode): Fix last changes. Add indexing. diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi index b7a9795e401..32a0f7b4d72 100644 --- a/doc/emacs/cal-xtra.texi +++ b/doc/emacs/cal-xtra.texi @@ -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 diff --git a/etc/NEWS b/etc/NEWS index f8c021c41f7..db33c03eef0 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -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). -- 2.39.5