[Emacs-diffs] trunk r113727: * lisp/calendar/calendar.el (calendar-font-lock-keywords): Set to nil

[Glenn Morris]

------------------------------------------------------------
revno: 113727
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-06 20:06:43 -0400
message:
  * lisp/calendar/calendar.el (calendar-font-lock-keywords): Set to nil
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/calendar/calendar.el      calendar.el-20091113204419-o5vbwnq5f7feedwu-478

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-08-06 23:53:49 +0000
+++ b/lisp/ChangeLog    2013-08-07 00:06:43 +0000
@@ -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  <address@hidden>

=== modified file 'lisp/calendar/calendar.el'
--- a/lisp/calendar/calendar.el 2013-08-06 23:53:49 +0000
+++ b/lisp/calendar/calendar.el 2013-08-07 00:06:43 +0000
@@ -2360,26 +2360,7 @@
   (+ (* 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