andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* holidays.el (holiday-christian-holidays): Rename an entry (bug#12289)

Browse source 
(Not worth a :version bump.)
This commit is contained in:
Glenn Morris 2012-08-29 21:18:41 -04:00
parent 64f8c4bd61
commit b66833534f
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-08-30 Glenn Morris <rgm@gnu.org>
* calendar/holidays.el (holiday-christian-holidays):
Rename an entry. (Bug#12289)
2012-08-29 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/sh-script.el (sh-font-lock-paren): Don't burp at BOB

2
lisp/calendar/holidays.el
View file

@ -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")))))