* lisp/calendar/calendar.el (calendar-font-lock-keywords): Set to nil

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff9b68e1987022907b9187ceed6cb9c1e8de0153..09e0349e7f1e9533a440185ff412cbe1cc3988cf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -16,8 +16,7 @@
        (calendar-day-abbrev-array):
        Also :set calendar-day-header-array, and maybe redraw.
        (calendar-day-header-array): New option.  (Bug#15007)
-       (calendar-font-lock-keywords): Use calendar-day-header-array,
-       and calendar- faces.  Make obsolete.
+       (calendar-font-lock-keywords): Set to nil and make obsolete.
        (calendar-day-name): Add option to use header array.
 
 2013-08-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index b5d06aba135747f2eb9eab1ae7c388b4c58749fc..e1f85832dc4efd35825db49ba15c2701f62fb55d 100644 (file)
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -2360,26 +2360,7 @@ Negative years are interpreted as years BC; -1 being 1 BC, and so on."
   (+ (* 12 (- yr2 yr1))
      (- mon2 mon1)))
 
-(defvar calendar-font-lock-keywords
-  ;; Month and year.  Not really needed now that calendar-month-header
-  ;; contains propertize, and not correct for non-american forms
-  ;; of that variable.
-  `((,(concat (regexp-opt (mapcar 'identity calendar-month-name-array) t)
-              " -?[0-9]+")
-     . 'calendar-month-header)
-    ;; Day headers.
-    ;; Also not needed now that calendar-generate-month uses propertize.
-    (,(regexp-opt
-       (list (truncate-string-to-width (aref calendar-day-header-array 6)
-                                       calendar-day-header-width)
-             (truncate-string-to-width (aref calendar-day-header-array 0)
-                                       calendar-day-header-width)))
-     ;; Saturdays and Sundays are highlighted differently.
-     . 'calendar-weekend-header)
-     (,(regexp-opt (mapcar (lambda (x) (truncate-string-to-width
-                                        x calendar-day-header-width))
-                           calendar-day-header-array))
-      . 'calendar-day-header))
+(defvar calendar-font-lock-keywords nil
   "Default keywords to highlight in Calendar mode.")
 
 (make-obsolete-variable 'calendar-font-lock-keywords