diff options
| author | Glenn Morris | 2008-06-26 03:43:18 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-06-26 03:43:18 +0000 |
| commit | e889393b2e5594a11a55147bb99ef1d0cc3c91f6 (patch) | |
| tree | 3ee3ea0c98f3f250574e8a837a7c21fafee4e052 | |
| parent | 0fa9d7e26ceaebb72dca7bffba49a7f5113a5f2c (diff) | |
| download | emacs-e889393b2e5594a11a55147bb99ef1d0cc3c91f6.tar.gz emacs-e889393b2e5594a11a55147bb99ef1d0cc3c91f6.zip | |
(calendar-iso-from-absolute): Add autoload cookie.
| -rw-r--r-- | etc/NEWS | 8 | ||||
| -rw-r--r-- | lisp/ChangeLog | 31 | ||||
| -rw-r--r-- | lisp/calendar/cal-iso.el | 1 |
3 files changed, 40 insertions, 0 deletions
| @@ -521,6 +521,14 @@ prefixes, eg `calendar-french-'. The old names you are likely to use | |||
| 521 | directly still exist, for the time being, as aliases, but please start | 521 | directly still exist, for the time being, as aliases, but please start |
| 522 | using the new names. | 522 | using the new names. |
| 523 | 523 | ||
| 524 | *** The whitespace in the calendar layout can be customized. | ||
| 525 | See the variables: | ||
| 526 | calendar-left-margin, calendar-intermonth-spacing, calendar-column-width, | ||
| 527 | calendar-day-header-width, and calendar-day-digit-width. | ||
| 528 | |||
| 529 | *** Text (e.g. ISO weeks) can be displayed between the calendar months. | ||
| 530 | See the variables calendar-intermonth-header and calendar-intermonth-text. | ||
| 531 | |||
| 524 | *** The function `holiday-chinese' computes holidays on the Chinese calendar. | 532 | *** The function `holiday-chinese' computes holidays on the Chinese calendar. |
| 525 | It has been used to add items to the list `holiday-oriental-holidays'. | 533 | It has been used to add items to the list `holiday-oriental-holidays'. |
| 526 | 534 | ||
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7d67a5576c8..76728eca4b8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,34 @@ | |||
| 1 | 2008-06-26 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * calendar/calendar.el (calendar-date-echo-text): Doc fix. | ||
| 4 | Add default :value for sexp type. | ||
| 5 | (calendar-month-edges): New variable. | ||
| 6 | (calendar-month-edges): New function. | ||
| 7 | (calendar-recompute-layout-variables): Set calendar-month-edges. | ||
| 8 | (calendar-intermonth-header, calendar-intermonth-text): New options. | ||
| 9 | (calendar-insert-at-column): New function. | ||
| 10 | (calendar-generate-month): Use calendar-insert-at-column. | ||
| 11 | Handle intermonth text. Add 'date property. | ||
| 12 | (calendar-column-to-month): Remove function. | ||
| 13 | (calendar-column-to-segment): New function. | ||
| 14 | (calendar-cursor-to-date): Use calendar-column-to-segment. | ||
| 15 | Check 'date property. | ||
| 16 | |||
| 17 | * calendar/calendar.el (calendar-print-other-dates): | ||
| 18 | Handle mouse events. | ||
| 19 | * calendar/cal-menu.el (calendar-mouse-print-dates): Remove function. | ||
| 20 | (cal-menu-context-mouse-menu): Use calendar-print-other-dates. | ||
| 21 | |||
| 22 | * calendar/cal-move.el (calendar-cursor-to-nearest-date): | ||
| 23 | Use calendar-column-to-segment, calendar-month-edges, and | ||
| 24 | the 'date property to handle intermonth text. | ||
| 25 | |||
| 26 | * calendar/cal-iso.el (calendar-iso-from-absolute): Add autoload cookie. | ||
| 27 | |||
| 28 | * calendar/cal-menu.el (cal-menu-moon-menu, cal-menu-diary-menu) | ||
| 29 | (cal-menu-holidays-menu, cal-menu-goto-menu, cal-menu-scroll-menu): | ||
| 30 | Add doc strings. | ||
| 31 | |||
| 1 | 2008-06-26 Stefan Monnier <monnier@iro.umontreal.ca> | 32 | 2008-06-26 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 33 | ||
| 3 | * minibuffer.el (completion-basic-try-completion): Use the text after | 34 | * minibuffer.el (completion-basic-try-completion): Use the text after |
diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el index cd50074be2b..822bfb02655 100644 --- a/lisp/calendar/cal-iso.el +++ b/lisp/calendar/cal-iso.el | |||
| @@ -50,6 +50,7 @@ Sunday). The Gregorian date Sunday, December 31, 1 BC is imaginary." | |||
| 50 | (define-obsolete-function-alias 'calendar-absolute-from-iso | 50 | (define-obsolete-function-alias 'calendar-absolute-from-iso |
| 51 | 'calendar-iso-to-absolute "23.1") | 51 | 'calendar-iso-to-absolute "23.1") |
| 52 | 52 | ||
| 53 | ;;;###cal-autoload | ||
| 53 | (defun calendar-iso-from-absolute (date) | 54 | (defun calendar-iso-from-absolute (date) |
| 54 | "Compute the `ISO commercial date' corresponding to the absolute DATE. | 55 | "Compute the `ISO commercial date' corresponding to the absolute DATE. |
| 55 | The ISO year corresponds approximately to the Gregorian year, but weeks | 56 | The ISO year corresponds approximately to the Gregorian year, but weeks |