mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-08 15:35:02 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Glenn Morris 2013-08-06 20:06:43 -04:00
parent 3b5c03d32b
commit 8a806f0430
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -16,8 +16,7 @@
(calendar-day-abbrev-array): (calendar-day-abbrev-array):
Also :set calendar-day-header-array, and maybe redraw. Also :set calendar-day-header-array, and maybe redraw.
(calendar-day-header-array): New option. (Bug#15007) (calendar-day-header-array): New option. (Bug#15007)
(calendar-font-lock-keywords): Use calendar-day-header-array, (calendar-font-lock-keywords): Set to nil and make obsolete.
and calendar- faces. Make obsolete.
(calendar-day-name): Add option to use header array. (calendar-day-name): Add option to use header array.
2013-08-06 Lars Magne Ingebrigtsen <larsi@gnus.org> 2013-08-06 Lars Magne Ingebrigtsen <larsi@gnus.org>

21
lisp/calendar/calendar.el
View File

@ -2360,26 +2360,7 @@ Negative years are interpreted as years BC; -1 being 1 BC, and so on."
(+ (* 12 (- yr2 yr1)) (+ (* 12 (- yr2 yr1))
(- mon2 mon1))) (- mon2 mon1)))
(defvar calendar-font-lock-keywords (defvar calendar-font-lock-keywords nil
;; 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))
"Default keywords to highlight in Calendar mode.") "Default keywords to highlight in Calendar mode.")
(make-obsolete-variable 'calendar-font-lock-keywords (make-obsolete-variable 'calendar-font-lock-keywords