diff options
| author | Glenn Morris | 2008-03-31 07:41:01 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-03-31 07:41:01 +0000 |
| commit | c8b69b0ac8b504a5ff5893df1c34434ce5d0c103 (patch) | |
| tree | 53c21c4b4283fd1bfa0ab9bb8b53cc8638f9009a | |
| parent | 0d16be53d138979c88d56bf0812a7c6c237d0491 (diff) | |
| download | emacs-c8b69b0ac8b504a5ff5893df1c34434ce5d0c103.tar.gz emacs-c8b69b0ac8b504a5ff5893df1c34434ce5d0c103.zip | |
Fix typo in previous change.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/calendar/cal-china.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 90ff6ffce9b..e17d8f3fa26 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -11,6 +11,8 @@ | |||
| 11 | * calendar/cal-bahai.el (calendar-bahai-date-string): Avoid an error for | 11 | * calendar/cal-bahai.el (calendar-bahai-date-string): Avoid an error for |
| 12 | pre-Bahai dates. | 12 | pre-Bahai dates. |
| 13 | 13 | ||
| 14 | * calendar/cal-china.el (holiday-chinese-new-year): Doc fix. | ||
| 15 | |||
| 14 | * calendar/cal-julian.el (holiday-julian): Fix a problem with holidays | 16 | * calendar/cal-julian.el (holiday-julian): Fix a problem with holidays |
| 15 | in the last fortnight in Julian October. | 17 | in the last fortnight in Julian October. |
| 16 | 18 | ||
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el index 702fec9931a..f73cc6580ee 100644 --- a/lisp/calendar/cal-china.el +++ b/lisp/calendar/cal-china.el | |||
| @@ -428,7 +428,7 @@ Returns (((MONTH DAY YEAR) TEXT)), where the date is Gregorian." | |||
| 428 | ;; In the Gregorian calendar, CNY falls between Jan 21 and Feb 20. | 428 | ;; In the Gregorian calendar, CNY falls between Jan 21 and Feb 20. |
| 429 | ;; Jan is visible if displayed-month = 12, 1, 2; Feb if d-m = 1, 2, 3. | 429 | ;; Jan is visible if displayed-month = 12, 1, 2; Feb if d-m = 1, 2, 3. |
| 430 | ;; If we shift the calendar forward one month, we can do a | 430 | ;; If we shift the calendar forward one month, we can do a |
| 431 | ;; one-sided test, namely: d-m <= 4 means CNYN might be visible. | 431 | ;; one-sided test, namely: d-m <= 4 means CNY might be visible. |
| 432 | (increment-calendar-month m y 1) ; shift forward a month | 432 | (increment-calendar-month m y 1) ; shift forward a month |
| 433 | (if (< m 5) | 433 | (if (< m 5) |
| 434 | (let ((chinese-new-year | 434 | (let ((chinese-new-year |