summaryrefslogtreecommitdiff
path: root/lisp/calendar/cal-china.el
Commit message (Collapse)AuthorAgeFilesLines
* ; Add 2024 to copyright yearsPo Lu2024-01-021-1/+1
|
* ; Add 2023 to copyright years.Eli Zaretskii2023-01-011-1/+1
|
* ; Add 2022 to copyright years.Eli Zaretskii2022-01-011-1/+1
|
* Use `lexical-binding` in all the cal-*.el filesStefan Monnier2021-01-201-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/calendar/cal-bahai.el: Use lexical-binding. (calendar-bahai-date-string): Use `calendar-dlet*`. * lisp/calendar/cal-china.el: Use lexical-binding. (calendar-chinese-zodiac-sign-on-or-after) (calendar-chinese-new-moon-on-or-after): Declare `year`. (calendar-chinese-from-absolute-for-diary) (calendar-chinese-to-absolute-for-diary) (calendar-chinese-mark-date-pattern): Avoid dynbound var `date` as function argument. * lisp/calendar/cal-coptic.el: Use lexical-binding. (calendar-coptic-date-string): Use `calendar-dlet*`. (calendar-ethiopic-to-absolute, calendar-ethiopic-from-absolute) (calendar-ethiopic-date-string, calendar-ethiopic-goto-date): Avoid dynbound var `date` as function argument. * lisp/calendar/cal-french.el: Use lexical-binding. * lisp/calendar/cal-hebrew.el: Use lexical-binding. (holiday-hebrew-hanukkah): Don't use the third form in `dotimes`. * lisp/calendar/cal-islam.el: Use lexical-binding. (calendar-islamic-to-absolute): Comment out unused vars `month` and `day`. * lisp/calendar/cal-move.el: * lisp/calendar/cal-mayan.el: * lisp/calendar/cal-iso.el: Use lexical-binding. * lisp/calendar/cal-persia.el: Use lexical-binding. (calendar-persian-date-string): Use `calendar-dlet*`. * lisp/calendar/cal-html.el: Use lexical-binding. (cal-html-insert-minical): Comment out unused var `date`. (cal-html-cursor-month, cal-html-cursor-year): Mark `event` arg as unused. * lisp/calendar/cal-menu.el: Use lexical-binding. (diary-list-include-blanks): Declare var. * lisp/calendar/cal-x.el: Use lexical-binding. * lisp/calendar/cal-tex.el: Use lexical-binding. (diary-list-include-blanks): Declare var. (cal-tex-insert-days, cal-tex-cursor-week-iso, cal-tex-week-hours) (cal-tex-weekly-common, cal-tex-cursor-filofax-2week) (cal-tex-cursor-filofax-daily, cal-tex-daily-page): Declare `date` as dynbound for the benefit of `cal-tex-daily-string`.
* Use `calendar-read-sexp` instead of the now obsolete `calendar-read`Stefan Monnier2021-01-201-9/+11
| | | | | | | | | | | | | | | | | | | * lisp/calendar/diary-lib.el (diary-insert-cyclic-entry): * lisp/calendar/cal-persia.el (calendar-persian-read-date): * lisp/calendar/cal-move.el (calendar-goto-day-of-year): * lisp/calendar/cal-mayan.el (calendar-mayan-read-haab-date) (calendar-mayan-read-tzolkin-date): * lisp/calendar/cal-julian.el (calendar-julian-goto-date) (calendar-astro-goto-day-number): * lisp/calendar/cal-iso.el (calendar-iso-read-date): * lisp/calendar/cal-islam.el (calendar-islamic-read-date): * lisp/calendar/cal-hebrew.el (calendar-hebrew-read-date) (calendar-hebrew-list-yahrzeits): * lisp/calendar/cal-french.el (calendar-french-goto-date): * lisp/calendar/cal-coptic.el (calendar-coptic-read-date): * lisp/calendar/cal-china.el (calendar-chinese-goto-date): * lisp/calendar/cal-bahai.el (calendar-bahai-read-date): * lisp/calendar/holidays.el (list-holidays): Use `calendar-read-sexp`.
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
| | | | Run "TZ=UTC0 admin/update-copyright".
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
| | | | Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
* Suppress warning about `entry' in calendarLars Ingebrigtsen2019-06-151-1/+4
| | | | | | | | * lisp/calendar/cal-china.el (entry): * lisp/calendar/cal-hebrew.el (entry): Suppress warning about dynamically bound `entry', which has to be bound for diary-chinese-anniversary and diary-hebrew-birthday to work. These function can be used in the sexp part of users' diary files.
* Suppress warning about prefixless date variable in calendarLars Ingebrigtsen2019-06-151-2/+6
| | | | | | | | | | | | | | | | * lisp/calendar/lunar.el (date): * lisp/calendar/cal-persia.el (date): * lisp/calendar/cal-mayan.el (date): * lisp/calendar/cal-julian.el (date): * lisp/calendar/cal-iso.el (date): * lisp/calendar/cal-islam.el (date): * lisp/calendar/cal-hebrew.el (date): * lisp/calendar/cal-french.el (date): * lisp/calendar/cal-coptic.el (date): * lisp/calendar/cal-china.el (date): * lisp/calendar/cal-bahai.el (date): Suppress warning about this prefix-less dynamic variable, because it's part of the documented calling convention used in the sexp part of users' diary files.
* ; UnmaintainGlenn Morris2019-06-011-1/+1
|
* Update copyright year to 2019Paul Eggert2019-01-011-1/+1
| | | | Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
* Update copyright year to 2018Paul Eggert2018-01-011-1/+1
| | | | Run admin/update-copyright.
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-131-1/+1
| | | | | | | | | | | | | Most of this change is to boilerplate commentary such as license URLs. This change was prompted by ftp://ftp.gnu.org's going-away party, planned for November. Change these FTP URLs to https://ftp.gnu.org instead. Make similar changes for URLs to other organizations moving away from FTP. Also, change HTTP to HTTPS for URLs to gnu.org and fsf.org when this works, as this will further help defend against man-in-the-middle attacks (for this part I omitted the MS-DOS and MS-Windows sources and the test tarballs to keep the workload down). HTTPS is not fully working to lists.gnu.org so I left those URLs alone for now.
* Update copyright year to 2017Paul Eggert2016-12-311-1/+1
| | | | Run admin/update-copyright.
* Mark some risky calendar variables.Glenn Morris2016-02-011-3/+3
| | | | | | | | | | | | | | | * lisp/calendar/cal-china.el (chinese-calendar-time-zone): Remove risky setting for deleted obsolete alias. (calendar-chinese-standard-time-zone-name) (calendar-chinese-daylight-saving-start) (calendar-chinese-daylight-saving-end): * lisp/calendar/calendar.el (calendar-iso-date-display-form) (calendar-european-date-display-form) (calendar-american-date-display-form, calendar-date-display-form): * lisp/calendar/diary-lib.el (diary-remind-message) (diary-header-line-format): * lisp/calendar/solar.el (calendar-time-display-form) (calendar-location-name): Mark as risky.
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
| | | | Run admin/update-copyright.
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
| | | | Run admin/update-copyright.
* Handle leap months in Chinese calendarLeo Liu2014-11-231-7/+22
| | | | | | | | Fixes: debbugs:18953 * calendar/cal-china.el (calendar-chinese-from-absolute-for-diary) (calendar-chinese-to-absolute-for-diary) (calendar-chinese-mark-date-pattern, diary-chinese-anniversary): Handle leap months in Chinese calendar. (Bug#18953)
* Remove calendar code obsolete since at least version 23.1Glenn Morris2014-10-051-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/calendar/cal-bahai.el (calendar-absolute-from-bahai) (calendar-print-bahai-date, calendar-bahai-prompt-for-date) (calendar-goto-bahai-date, list-bahai-diary-entries) (mark-bahai-calendar-date-pattern, mark-bahai-diary-entries) (insert-bahai-diary-entry, insert-monthly-bahai-diary-entry) (insert-yearly-bahai-diary-entry): * lisp/calendar/cal-china.el (chinese-calendar-time-zone) (chinese-calendar-location-name) (chinese-calendar-daylight-time-offset) (chinese-calendar-standard-time-zone-name) (chinese-calendar-daylight-time-zone-name) (chinese-calendar-daylight-savings-starts) (chinese-calendar-daylight-savings-ends) (chinese-calendar-daylight-savings-starts-time) (chinese-calendar-daylight-savings-ends-time) (chinese-calendar-celestial-stem) (chinese-calendar-terrestrial-branch) (calendar-absolute-from-chinese, calendar-print-chinese-date) (calendar-goto-chinese-date): * lisp/calendar/cal-coptic.el (calendar-absolute-from-coptic) (calendar-print-coptic-date, coptic-prompt-for-date) (calendar-goto-coptic-date, calendar-absolute-from-ethiopic) (calendar-print-ethiopic-date, calendar-goto-ethiopic-date): * lisp/calendar/cal-french.el (calendar-absolute-from-french) (calendar-print-french-date, calendar-goto-french-date): * lisp/calendar/cal-hebrew.el (diary-sabbath-candles-minutes) (calendar-absolute-from-hebrew, calendar-print-hebrew-date) (hebrew-calendar-yahrzeit, calendar-goto-hebrew-date) (holiday-rosh-hashanah-etc, holiday-hanukkah) (holiday-passover-etc, holiday-tisha-b-av-etc) (list-hebrew-diary-entries, mark-hebrew-calendar-date-pattern) (mark-hebrew-diary-entries, insert-hebrew-diary-entry) (insert-monthly-hebrew-diary-entry) (insert-yearly-hebrew-diary-entry, list-yahrzeit-dates) (diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha) (diary-sabbath-candles): * lisp/calendar/cal-islam.el (calendar-absolute-from-islamic) (calendar-print-islamic-date, calendar-goto-islamic-date) (list-islamic-diary-entries, mark-islamic-calendar-date-pattern) (mark-islamic-diary-entries, insert-islamic-diary-entry) (insert-monthly-islamic-diary-entry) (insert-yearly-islamic-diary-entry): * lisp/calendar/cal-iso.el (calendar-absolute-from-iso) (calendar-print-iso-date, calendar-iso-read-args) (calendar-goto-iso-date, calendar-goto-iso-week): * lisp/calendar/cal-julian.el (calendar-absolute-from-julian) (calendar-print-julian-date, calendar-goto-julian-date) (calendar-absolute-from-astro, calendar-print-astro-day-number) (calendar-goto-astro-day-number): * lisp/calendar/cal-mayan.el (calendar-print-mayan-date) (calendar-next-haab-date, calendar-previous-haab-date) (calendar-next-tzolkin-date, calendar-previous-tzolkin-date) (calendar-next-calendar-round-date) (calendar-previous-calendar-round-date) (calendar-absolute-from-mayan-long-count) (calendar-goto-mayan-long-count-date): * lisp/calendar/cal-move.el (scroll-calendar-left) (scroll-calendar-right, scroll-calendar-left-three-months) (scroll-calendar-right-three-months): * lisp/calendar/cal-persia.el (calendar-absolute-from-persian) (calendar-print-persian-date, persian-prompt-for-date) (calendar-goto-persian-date): * lisp/calendar/cal-x.el (calendar-after-frame-setup-hooks): * lisp/calendar/calendar.el (view-diary-entries-initially) (mark-diary-entries-in-calendar, calendar-today-face) (diary-face, holiday-face, view-calendar-holidays-initially) (mark-holidays-in-calendar, initial-calendar-window-hook) (today-visible-calendar-hook, today-invisible-calendar-hook) (hebrew-diary-entry-symbol, islamic-diary-entry-symbol) (bahai-diary-entry-symbol, american-date-diary-pattern) (european-date-diary-pattern, european-calendar-display-form) (american-calendar-display-form, holidays-in-diary-buffer) (all-hebrew-calendar-holidays, all-christian-calendar-holidays) (all-islamic-calendar-holidays, all-bahai-calendar-holidays) (fancy-diary-buffer, increment-calendar-month) (extract-calendar-month, extract-calendar-day) (extract-calendar-year, exit-calendar, calendar-date-is-legal-p) (mark-visible-calendar-date, calendar-version): * lisp/calendar/diary-lib.el (diary-button-face, sexp-diary-entry-symbol) (diary-display-hook, list-diary-entries-hook) (mark-diary-entries-hook, nongregorian-diary-listing-hook) (nongregorian-diary-marking-hook, print-diary-entries-hook) (abbreviated-calendar-year, number-of-diary-entries) (view-other-diary-entries, add-to-diary-list) (include-other-diary-files, simple-diary-display) (fancy-diary-display, print-diary-entries, mark-diary-entries) (mark-sexp-diary-entries, mark-included-diary-files) (mark-calendar-days-named, mark-calendar-month) (mark-calendar-date-pattern, sort-diary-entries) (list-sexp-diary-entries, make-diary-entry, insert-diary-entry) (insert-weekly-diary-entry, insert-monthly-diary-entry) (insert-yearly-diary-entry, insert-anniversary-diary-entry) (insert-block-diary-entry, insert-cyclic-diary-entry) (fancy-diary-font-lock-keywords, fancy-diary-display-mode): * lisp/calendar/holidays.el (general-holidays, oriental-holidays) (local-holidays, other-holidays, hebrew-holidays) (christian-holidays, islamic-holidays, bahai-holidays) (solar-holidays, list-calendar-holidays) (check-calendar-holidays, mark-calendar-holidays) (filter-visible-calendar-holidays): * lisp/calendar/lunar.el (calendar-phases-of-moon, phases-of-moon) (diary-phases-of-moon): Remove obsolete aliases. * lisp/calendar/cal-menu.el (cal-menu-load-hook): Remove obsolete hook. * calendar/cal-x.el (calendar-one-frame-setup) (calendar-only-one-frame-setup, calendar-two-frame-setup): Remove obsolete functions. (cal-x-load-hook): Remove obsolete hook. * calendar/calendar.el (european-calendar-style): Remove obsolete variable. (calendar-date-style): No longer consult european-calendar-style. * calendar/calendar.el (european-calendar, american-calendar): Remove obsolete commands. * calendar/calendar.el (calendar-for-loop): Remove obsolete macro. * calendar/diary-lib.el (diary-face): Remove obsolete variable. (diary-font-lock-date-forms, diary-fancy-font-lock-keywords): Use the face `diary' instead of the variable `diary-face'. * calendar/holidays.el (hebrew-holidays-1, hebrew-holidays-2) (hebrew-holidays-3, hebrew-holidays-4): Remove obsolete variables. * lisp/calendar/icalendar.el (icalendar--date-style): Remove function. Replace all uses with calendar-date-style. * lisp/textmodes/remember.el (calendar-date-style): Declare. (remember-diary-convert-entry): No longer consult european-calendar-style. * test/automated/icalendar-tests.el (icalendar--calendar-style): Remove test, no longer relevant.
* Support Chinese diary entries in calendar and diaryLeo Liu2014-05-041-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/emacs/cal-xtra.texi (Non-Gregorian Diary): Document new features for Chinese calendar and diary. * etc/NEWS: Mention support for Chinese dates in calendar and diary. * lisp/calendar/cal-china.el (calendar-chinese-month-name-array): New var. (calendar-chinese-from-absolute-for-diary) (calendar-chinese-to-absolute-for-diary) (calendar-chinese-mark-date-pattern, diary-chinese-mark-entries) (diary-chinese-list-entries): New functions to list and mark Chinese diary entries in the calendar window. (diary-chinese-anniversary) (diary-chinese-insert-anniversary-entry) (diary-chinese-insert-entry, diary-chinese-insert-monthly-entry) (diary-chinese-insert-yearly-entry): New commands to insert Chinese diary entries. * lisp/calendar/cal-menu.el (cal-menu-diary-menu): Add entries for inserting Chinese diary entries. * lisp/calendar/calendar.el (diary-chinese-entry-symbol): New customizable variable. (calendar-mode-map): Add bindings for inserting Chinese diary entries. * lisp/calendar/diary-lib.el (diary-font-lock-keywords): Support font-locking Chinese dates. Fixes: debbugs:17393
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
|
* * calendar/cal-china.el (calendar-chinese-year-cache): Recenter on 2015.Glenn Morris2013-08-281-14/+14
|
* Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
|
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
|
* calendar housekeeping prompted by lexical-binding.Glenn Morris2011-04-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | * 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.
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-2/+1
|
* Nuke arch-tags.Glenn Morris2011-01-151-1/+0
|
* Merge from emacs-23Stefan Monnier2011-01-141-1/+1
|\
| * Add 2011 to FSF/AIST copyright years.Glenn Morris2011-01-021-1/+1
| |
* | Add "Package:" file headers to denote built-in packages.Chong Yidong2010-08-291-0/+1
|/
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
|
* (holiday-chinese): Make it slightly more efficient.Glenn Morris2009-09-051-31/+36
|
* Add 2009 to copyright years.Glenn Morris2009-01-051-1/+1
|
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-061-6/+4
|
* (holiday-chinese-qingming, holiday-chinese-winter-solstice)Glenn Morris2008-04-231-0/+66
| | | | (holiday-chinese): New functions.
* (chinese-calendar-time-zone): Mark obsolete name as risky too.Glenn Morris2008-04-121-23/+26
| | | | | Move non-autoloaded define-obsolete-variable-alias calls for defcustoms not in dumped files before the associated defcustom.
* (calendar-chinese-time-zone): Mark as risky.Glenn Morris2008-04-111-0/+4
|
* Replace int-to-string with number-to-string.Glenn Morris2008-04-081-4/+4
|
* Update for calendar.el name changes.Glenn Morris2008-04-071-7/+7
|
* Comment.Glenn Morris2008-04-061-1/+1
|
* (calendar-chinese): Rename custom group from chinese-calendar. Update users.Glenn Morris2008-04-051-109/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (calendar-chinese-time-zone): Rename chinese-calendar-time-zone. Keep old name as alias, update users. (calendar-chinese-location-name): Rename chinese-calendar-location-name. Keep old name as alias. (calendar-chinese-daylight-time-offset): Rename chinese-calendar-daylight-time-offset. Keep old name as alias, update users. (calendar-chinese-standard-time-zone-name): Rename chinese-calendar-standard-time-zone-name. Keep old name as alias, update users. (calendar-chinese-daylight-saving-start): Rename chinese-calendar-daylight-savings-starts. Keep old name as alias, update users. (calendar-chinese-daylight-saving-end): Rename chinese-calendar-daylight-savings-ends. Keep old name as alias, update users. (calendar-chinese-daylight-saving-start-time): Rename chinese-calendar-daylight-savings-starts-time. Keep old name as alias, update users. (calendar-chinese-daylight-saving-end-time): Rename chinese-calendar-daylight-savings-ends-time. Keep old name as alias, update users. (calendar-chinese-celestial-stem): Rename calendar-chinese-celestial-stem. Keep old name as alias, update users. (calendar-chinese-terrestrial-branch): Rename calendar-chinese-terrestrial-branch. Keep old name as alias, update users. (calendar-chinese-zodiac-sign-on-or-after): Rename chinese-zodiac-sign-on-or-after. Update callers. (calendar-chinese-new-moon-on-or-after): Rename chinese-new-moon-on-or-after. Update callers. (calendar-chinese-month-list): Rename chinese-month-list. Update callers. (calendar-chinese-number-months): Rename number-chinese-months. Update callers. (calendar-chinese-compute-year): Rename compute-chinese-year. Update callers. (calendar-chinese-year-cache): Rename chinese-year-cache. Update users. (calendar-chinese-year): Rename chinese-year. Update callers. (calendar-chinese-year-cache-init): Rename chinese-year-cache-init. (calendar-chinese-to-absolute): Rename calendar-absolute-from-chinese. Keep old name as alias, update callers. (calendar-chinese-print-date): Rename calendar-print-chinese-date. Keep old name as alias, update callers. (calendar-chinese-months-to-alist): Rename make-chinese-month-assoc-list. Update callers. (calendar-chinese-months): Rename chinese-months. Update callers. (calendar-chinese-goto-date): Rename calendar-goto-chinese-date. Keep old name as alias, update callers.
* Update for cal-julian name changes.Glenn Morris2008-04-041-3/+3
|
* Whitespace only.Glenn Morris2008-04-021-3/+3
|
* (holiday-chinese-new-year): Use a single let.Glenn Morris2008-04-021-11/+10
|
* (Commentary): Point to calendar.el.Glenn Morris2008-04-011-15/+13
|
* Fix typo in previous change.Glenn Morris2008-03-311-1/+1
|
* (holiday-chinese-new-year): Doc fix and comment.Glenn Morris2008-03-311-6/+12
|
* Explicitly require calendar.Glenn Morris2008-03-261-1/+7
|
* (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):Glenn Morris2008-03-201-8/+32
| | | | Make defcustoms.
* (calendar-chinese-from-absolute, calendar-chinese-date-string): ExpandGlenn Morris2008-03-161-2/+5
| | | | calendar-mod calls.