aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2014-05-05 07:49:33 +0800
committerLeo Liu2014-05-05 07:49:33 +0800
commitf930a0636e77cc51bc7e0dd5b80482f6607bc73d (patch)
treece33fc3af5a306b146adf6b797ed636134d7fd9e
parentf8c2cef5e60d31f48c44fc883bc72d2f6090834b (diff)
downloademacs-f930a0636e77cc51bc7e0dd5b80482f6607bc73d.tar.gz
emacs-f930a0636e77cc51bc7e0dd5b80482f6607bc73d.zip
* etc/NEWS: Correct spelling.
* lisp/calendar/diary-lib.el (calendar-chinese-month-name-array): Defvar to pacify compiler.
-rw-r--r--etc/NEWS2
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calendar/diary-lib.el1
3 files changed, 7 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index eed1c43af44..4c79d49d25b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -83,7 +83,7 @@ to delete or undelete multiple messages.
83`diary-chinese-insert-yearly-entry' 83`diary-chinese-insert-yearly-entry'
84 84
85+++ 85+++
86*** Calendar can list and mark diary entires with Chinese dates: 86*** Calendar can list and mark diary entries with Chinese dates:
87`diary-chinese-list-entries' and `diary-chinese-mark-entries'. 87`diary-chinese-list-entries' and `diary-chinese-mark-entries'.
88 88
89** The URL package accepts now the protocols "ssh", "scp" and "rsync". 89** The URL package accepts now the protocols "ssh", "scp" and "rsync".
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0032864b66..c0fe9c69f67 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-05-04 Leo Liu <sdl.web@gmail.com>
2
3 * calendar/diary-lib.el (calendar-chinese-month-name-array):
4 Defvar to pacify compiler.
5
12014-05-04 Eli Zaretskii <eliz@gnu.org> 62014-05-04 Eli Zaretskii <eliz@gnu.org>
2 7
3 * mail/rmailsum.el (rmail-new-summary-1): Fix a typo in a comment. 8 * mail/rmailsum.el (rmail-new-summary-1): Fix a typo in a comment.
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index b89b808f690..a4e36d9abe8 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -2374,6 +2374,7 @@ return a font-lock pattern matching array of MONTHS and marking SYMBOL."
2374(defvar calendar-hebrew-month-name-array-leap-year) 2374(defvar calendar-hebrew-month-name-array-leap-year)
2375(defvar calendar-islamic-month-name-array) 2375(defvar calendar-islamic-month-name-array)
2376(defvar calendar-bahai-month-name-array) 2376(defvar calendar-bahai-month-name-array)
2377(defvar calendar-chinese-month-name-array)
2377 2378
2378;;;###cal-autoload 2379;;;###cal-autoload
2379(defun diary-font-lock-keywords () 2380(defun diary-font-lock-keywords ()