diff options
| author | Leo Liu <sdl.web@gmail.com> | 2014-05-04 08:16:58 +0800 |
|---|---|---|
| committer | Leo Liu <sdl.web@gmail.com> | 2014-05-04 08:16:58 +0800 |
| commit | bbdcf64f499636ba9567e8fed8f209e06380352c (patch) | |
| tree | 36f63f7f60f4b8972576b843b1354244e7f82f5f /lisp/calendar/diary-lib.el | |
| parent | c3a435feddf2e1c1e74e41a05d4dd8a59bc766b0 (diff) | |
| download | emacs-bbdcf64f499636ba9567e8fed8f209e06380352c.tar.gz | |
Support Chinese diary entries in calendar and diary
* 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
Diffstat (limited to 'lisp/calendar/diary-lib.el')
| -rw-r--r-- | lisp/calendar/diary-lib.el | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index c609cee7d6f..b89b808f690 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -2396,6 +2396,11 @@ return a font-lock pattern matching array of MONTHS and marking SYMBOL." cal-bahai calendar-bahai-month-name-array diary-bahai-entry-symbol) + (diary-font-lock-keywords-1 diary-chinese-mark-entries + diary-chinese-list-entries + cal-china + calendar-chinese-month-name-array + diary-chinese-entry-symbol) (list (cons (format "^%s.*$" (regexp-quote diary-include-string)) @@ -2412,7 +2417,8 @@ return a font-lock pattern matching array of MONTHS and marking SYMBOL." (regexp-opt (mapcar 'regexp-quote (list diary-hebrew-entry-symbol diary-islamic-entry-symbol - diary-bahai-entry-symbol)) + diary-bahai-entry-symbol + diary-chinese-entry-symbol)) t)) '(1 font-lock-constant-face)) '(diary-font-lock-sexps . font-lock-keyword-face) |