From 8a806f0430cf2c42e08768920a714cc497ce6f77 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 6 Aug 2013 20:06:43 -0400 Subject: [PATCH] * lisp/calendar/calendar.el (calendar-font-lock-keywords): Set to nil --- lisp/ChangeLog | 3 +-- lisp/calendar/calendar.el | 21 +-------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ff9b68e1987..09e0349e7f1 100644 --- 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 diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index b5d06aba135..e1f85832dc4 100644 --- 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 -- 2.11.4.GIT