procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

diary-lib.el fix for bug#7891.

Browse source 
* lisp/calendar/diary-lib.el (diary-font-lock-keywords):
Tweak diary-time-regexp match.
This commit is contained in:
Glenn Morris 2011-02-03 19:23:55 -08:00
parent 9783df21c0
commit 9ad53e98fd
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2011-02-04 Glenn Morris <rgm@gnu.org>
* 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.

12
lisp/calendar/diary-lib.el
View file

@ -2312,9 +2312,19 @@ return a font-lock pattern matching array of MONTHS and marking SYMBOL."
t))
'(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-regexp)
. 'diary-time))))
. (0 'diary-time t)))))
; . 'diary-time))))
(defvar diary-font-lock-keywords (diary-font-lock-keywords)
"Forms to highlight in `diary-mode'.")