diff options
| author | Glenn Morris | 2008-03-27 07:59:33 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-03-27 07:59:33 +0000 |
| commit | f97492e58e62c2cf0b62a05dcb32fc7bfb00fba9 (patch) | |
| tree | 739c148246c008c9d0e1b0aa2e3c5171d7ae566f | |
| parent | 54f638111e601ba20551b3c36217de81cb75bab0 (diff) | |
| download | emacs-f97492e58e62c2cf0b62a05dcb32fc7bfb00fba9.tar.gz emacs-f97492e58e62c2cf0b62a05dcb32fc7bfb00fba9.zip | |
(list-holidays): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/calendar/holidays.el | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 762026f0409..20c6d317b06 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -25,6 +25,8 @@ | |||
| 25 | (fancy-diary-display): Doc fix. Remove unneeded local entry-list. | 25 | (fancy-diary-display): Doc fix. Remove unneeded local entry-list. |
| 26 | (diary-mark-entries-1): Fix position offsets in non-gregorian case. | 26 | (diary-mark-entries-1): Fix position offsets in non-gregorian case. |
| 27 | 27 | ||
| 28 | * calendar/holidays.el (list-holidays): Doc fix. | ||
| 29 | |||
| 28 | 2008-03-26 Jay Belanger <jay.p.belanger@gmail.com> | 30 | 2008-03-26 Jay Belanger <jay.p.belanger@gmail.com> |
| 29 | 31 | ||
| 30 | * calc/calc-store.el (calc-read-var-name-history): | 32 | * calc/calc-store.el (calc-read-var-name-history): |
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index 55323597576..833c8b65245 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el | |||
| @@ -129,10 +129,9 @@ This function is suitable for execution in a .emacs file." | |||
| 129 | ;;;###autoload | 129 | ;;;###autoload |
| 130 | (defun list-holidays (y1 &optional y2 l label) | 130 | (defun list-holidays (y1 &optional y2 l label) |
| 131 | "Display holidays for years Y1 to Y2 (inclusive). | 131 | "Display holidays for years Y1 to Y2 (inclusive). |
| 132 | 132 | Y2 defaults to Y1. The optional list of holidays L defaults to | |
| 133 | The optional list of holidays L defaults to `calendar-holidays'. | 133 | `calendar-holidays'. If you want to control what holidays are |
| 134 | If you want to control what holidays are displayed, use a | 134 | displayed, use a different list. For example, |
| 135 | different list. For example, | ||
| 136 | 135 | ||
| 137 | (list-holidays 2006 2006 | 136 | (list-holidays 2006 2006 |
| 138 | (append general-holidays local-holidays other-holidays)) | 137 | (append general-holidays local-holidays other-holidays)) |