[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108126: * holidays.el (holiday-christian-holidays): Rename an entry (bug#12289)

[Glenn Morris]

------------------------------------------------------------
revno: 108126
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-08-29 21:18:41 -0400
message:
  * holidays.el (holiday-christian-holidays): Rename an entry (bug#12289)
  (Not worth a :version bump.)
modified:
  lisp/ChangeLog
  lisp/calendar/holidays.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-29 18:33:35 +0000
+++ b/lisp/ChangeLog    2012-08-30 01:18:41 +0000
@@ -1,3 +1,8 @@
+2012-08-30  Glenn Morris  <address@hidden>
+
+       * calendar/holidays.el (holiday-christian-holidays):
+       Rename an entry.  (Bug#12289)
+
 2012-08-29  Stefan Monnier  <address@hidden>
 
        * progmodes/sh-script.el (sh-font-lock-paren): Don't burp at BOB

=== modified file 'lisp/calendar/holidays.el'
--- a/lisp/calendar/holidays.el 2012-04-09 07:11:39 +0000
+++ b/lisp/calendar/holidays.el 2012-08-30 01:18:41 +0000
@@ -250,7 +250,7 @@
     (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")))))