summaryrefslogtreecommitdiff
path: root/lisp/calendar/cal-china.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-04-18 21:11:01 -0700
committerGlenn Morris <rgm@gnu.org>2011-04-18 21:11:01 -0700
commitbc4f7f3d586a8d32718e27e99226d1b5ab091db5 (patch)
tree7d3239f45a1385b3686c74fbccce23f5509a71c1 /lisp/calendar/cal-china.el
parent16a43933e891bae502efbe367e32608fcfffdec3 (diff)
downloademacs-bc4f7f3d586a8d32718e27e99226d1b5ab091db5.tar.gz
calendar housekeeping prompted by lexical-binding.
* lisp/calendar/appt.el (appt-make-list): * lisp/calendar/cal-china.el (calendar-chinese-date-string): * lisp/calendar/cal-hebrew.el (calendar-hebrew-list-yahrzeits) (diary-hebrew-yahrzeit): * lisp/calendar/cal-tex.el (cal-tex-last-blank-p, cal-tex-cursor-week2): * lisp/calendar/calendar.el (calendar-generate-window): * lisp/calendar/time-date.el (time-to-days): Remove unused local variables. * lisp/calendar/cal-dst.el (dst-adjust-time): Remove never-implemented optional argument `style'. * lisp/calendar/cal-tex.el (cal-tex-list-holidays, cal-tex-cursor-month) (cal-tex-cursor-week, cal-tex-cursor-week2, cal-tex-cursor-week-iso) (cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week) (cal-tex-cursor-filofax-daily, cal-tex-mini-calendar) * lisp/calendar/cal-html.el (cal-html-insert-minical): * lisp/calendar/diary-lib.el (diary-list-entries-1, diary-list-entries) (calendar-mark-date-pattern): Prefix "unused" locals.
Diffstat (limited to 'lisp/calendar/cal-china.el')
-rw-r--r--lisp/calendar/cal-china.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index fce398709ad..d17c2c71f8a 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -575,8 +575,7 @@ Defaults to today's date if DATE is not given."
;; Remainder of (1+(floor month))/12, with
;; 12 instead of 0.
(1+ (mod (floor month) 12))
- 1)))
- (m-cycle (% (+ (* year 5) (floor month)) 60)))
+ 1))))
(format "Cycle %s, year %s (%s), %smonth %s%s, day %s (%s)"
cycle
year (calendar-chinese-sexagesimal-name year)