[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100452: diary-lib.el fix for bug#
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100452: diary-lib.el fix for bug#7891. |
Date: |
Thu, 03 Feb 2011 19:23:55 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100452
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Thu 2011-02-03 19:23:55 -0800
message:
diary-lib.el fix for bug#7891.
* lisp/calendar/diary-lib.el (diary-font-lock-keywords):
Tweak diary-time-regexp match.
modified:
lisp/ChangeLog
lisp/calendar/diary-lib.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-02-04 03:21:11 +0000
+++ b/lisp/ChangeLog 2011-02-04 03:23:55 +0000
@@ -1,5 +1,8 @@
2011-02-04 Glenn Morris <address@hidden>
+ * 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.
=== modified file 'lisp/calendar/diary-lib.el'
--- a/lisp/calendar/diary-lib.el 2011-01-02 23:50:46 +0000
+++ b/lisp/calendar/diary-lib.el 2011-02-04 03:23:55 +0000
@@ -2312,9 +2312,19 @@
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'.")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r100452: diary-lib.el fix for bug#7891.,
Glenn Morris <=