Mercurial > emacs
comparison lisp/calendar/cal-china.el @ 93454:648b1e67e4b5
Fix typo in previous change.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Mon, 31 Mar 2008 07:40:36 +0000 |
parents | 22b3710e206a |
children | 92c1edaba777 |
comparison
equal
deleted
inserted
replaced
93453:22b3710e206a | 93454:648b1e67e4b5 |
---|---|
426 (let ((m displayed-month) | 426 (let ((m displayed-month) |
427 (y displayed-year)) | 427 (y displayed-year)) |
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 |
435 (calendar-gregorian-from-absolute | 435 (calendar-gregorian-from-absolute |
436 (cadr (assoc 1 (chinese-year y)))))) | 436 (cadr (assoc 1 (chinese-year y)))))) |