diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-09-05 00:05:56 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-09-05 00:05:56 -0700 |
| commit | 7e570fbf3ef8ccd31df2651f5d2775c5697d5950 (patch) | |
| tree | 2a722a870a0240ded0b1fcffb34f52a1d7d668e3 /lisp/calendar/holidays.el | |
| parent | 1a1ecd2b14f38fcd995516a71b49c8810eac5828 (diff) | |
| parent | f1220388bca64f31182daacfb2eefcc8053af11a (diff) | |
| download | emacs-7e570fbf3ef8ccd31df2651f5d2775c5697d5950.tar.gz | |
Merge from emacs-24; up to 2012-05-05T02:50:20Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/calendar/holidays.el')
| -rw-r--r-- | lisp/calendar/holidays.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index 043d402f612..9643a1e2905 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -250,7 +250,7 @@ See the documentation for `calendar-holidays' for details." (if calendar-christian-all-holidays-flag (append (holiday-fixed 1 6 "Epiphany") - (holiday-julian 12 25 "Eastern Orthodox Christmas") + (holiday-julian 12 25 "Christmas (Julian calendar)") (holiday-greek-orthodox-easter) (holiday-fixed 8 15 "Assumption") (holiday-advent 0 "Advent"))))) |