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

(Not worth a :version bump.)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0112dad334414fc0dd12b85acdb3d13c825a208e..a2e9abede1358be3052ff13c27f1bbd223422ca3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 9edd353b889035cc4913236587e09f84f7e8556e..8991d20c433787162e51c701b0d4a164db442ee5 100644 (file)
--- 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")))))