diff options
-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 @@ * calendar/cal-bahai.el (calendar-bahai-date-string): Avoid an error for pre-Bahai dates. + * calendar/cal-china.el (holiday-chinese-new-year): Doc fix. + * calendar/cal-julian.el (holiday-julian): Fix a problem with holidays in the last fortnight in Julian October. 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." ;; In the Gregorian calendar, CNY falls between Jan 21 and Feb 20. ;; Jan is visible if displayed-month = 12, 1, 2; Feb if d-m = 1, 2, 3. ;; If we shift the calendar forward one month, we can do a - ;; one-sided test, namely: d-m <= 4 means CNYN might be visible. + ;; one-sided test, namely: d-m <= 4 means CNY might be visible. (increment-calendar-month m y 1) ; shift forward a month (if (< m 5) (let ((chinese-new-year |