Commit 9ad53e98 authored by Glenn Morris's avatar Glenn Morris
Browse files

diary-lib.el fix for bug#7891.

* lisp/calendar/diary-lib.el (diary-font-lock-keywords):
Tweak diary-time-regexp match.
parent 9783df21
2011-02-04 Glenn Morris <>
* calendar/diary-lib.el (diary-font-lock-keywords):
Tweak diary-time-regexp match. (Bug#7891)
* progmodes/f90.el (f90-find-tag-default): New function. (Bug#7919)
(f90-mode): Use it for mode's `find-tag-default-function' property.
......@@ -2312,9 +2312,19 @@ return a font-lock pattern matching array of MONTHS and marking SYMBOL."
'(1 font-lock-reference-face))
'(diary-font-lock-sexps . font-lock-keyword-face)
;; Don't need to worry about space around "-" because the first
;; match takes care of that. It does mean the "-" itself may or
;; may not be fontified though.
;; diary-date-forms often include a final character that is not
;; part of the date (eg a non-digit to mark the end of the year).
;; This can use up the only space char between a date and time (b#7891).
;; Hence we use OVERRIDE, which can only override whitespace.
;; FIXME it's probably better to tighten up the diary-time-regexp
;; and drop the whitespace requirement below.
`(,(format "\\(^\\|\\s-\\)%s\\(-%s\\)?" diary-time-regexp
. 'diary-time))))
. (0 'diary-time t)))))
; . 'diary-time))))
(defvar diary-font-lock-keywords (diary-font-lock-keywords)
"Forms to highlight in `diary-mode'.")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment