diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/calendar/diary-lib.el | 38 |
2 files changed, 27 insertions, 18 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 277d7c12cf7..3d7b2c33832 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ 2011-05-04 Glenn Morris <rgm@gnu.org> + * calendar/diary-lib.el (diary-fancy-date-pattern): Turn it into a + function, so it follows changes in calendar-date-style. + (diary-fancy-date-matcher): New function. + (diary-fancy-font-lock-keywords): Use diary-fancy-date-matcher. + (diary-fancy-font-lock-fontify-region-function): + Use diary-fancy-date-pattern as a function. + * calendar/diary-lib.el (diary-fancy-date-pattern): Do not use non-numbers for `year' etc pseudo-variables. (Bug#8583) diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index ee9ad0e4567..43c0682277c 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -2364,8 +2364,9 @@ return a font-lock pattern matching array of MONTHS and marking SYMBOL." ;;; Fancy Diary Mode. -;; FIXME does not update upon changes to the name-arrays. -(defvar diary-fancy-date-pattern +(defun diary-fancy-date-pattern () + "Return a regexp matching the first line of a fancy diary date header. +This depends on the calendar date style." (concat (let ((dayname (diary-name-pattern calendar-day-name-array nil t)) (monthname (diary-name-pattern calendar-month-name-array nil t)) @@ -2381,26 +2382,27 @@ return a font-lock pattern matching array of MONTHS and marking SYMBOL." (mapconcat 'eval calendar-date-display-form "") nil t)) ;; Optional ": holiday name" after the date. - "\\(: .*\\)?") - "Regular expression matching the first line of a fancy diary date header.") + "\\(: .*\\)?")) + +(defun diary-fancy-date-matcher (limit) + "Search for a fancy diary data header, up to LIMIT." + ;; Any number of " other holiday name" lines, followed by "==" line. + (when (re-search-forward + (format "%s\\(\n +.*\\)*\n=+$" (diary-fancy-date-pattern)) limit t) + (put-text-property (match-beginning 0) (match-end 0) 'font-lock-multiline t) + t)) (define-obsolete-variable-alias 'fancy-diary-font-lock-keywords 'diary-fancy-font-lock-keywords "23.1") (defvar diary-fancy-font-lock-keywords - (list - (list - ;; Any number of " other holiday name" lines, followed by "==" line. - (concat diary-fancy-date-pattern "\\(\n +.*\\)*\n=+$") - '(0 (progn (put-text-property (match-beginning 0) (match-end 0) - 'font-lock-multiline t) - diary-face))) - '("^.*\\([aA]nniversary\\|[bB]irthday\\).*$" . 'diary-anniversary) - '("^.*Yahrzeit.*$" . font-lock-reference-face) - '("^\\(Erev \\)?Rosh Hodesh.*" . font-lock-function-name-face) - '("^Day.*omer.*$" . font-lock-builtin-face) - '("^Parashat.*$" . font-lock-comment-face) - `(,(format "\\(^\\|\\s-\\)%s\\(-%s\\)?" diary-time-regexp + `((diary-fancy-date-matcher . diary-face) + ("^.*\\([aA]nniversary\\|[bB]irthday\\).*$" . 'diary-anniversary) + ("^.*Yahrzeit.*$" . font-lock-reference-face) + ("^\\(Erev \\)?Rosh Hodesh.*" . font-lock-function-name-face) + ("^Day.*omer.*$" . font-lock-builtin-face) + ("^Parashat.*$" . font-lock-comment-face) + (,(format "\\(^\\|\\s-\\)%s\\(-%s\\)?" diary-time-regexp diary-time-regexp) . 'diary-time)) "Keywords to highlight in fancy diary display.") @@ -2416,7 +2418,7 @@ Fontify the region between BEG and END, quietly unless VERBOSE is non-nil." (while (and (looking-at " +[^ ]") (zerop (forward-line -1)))) ;; This check not essential. - (if (looking-at diary-fancy-date-pattern) + (if (looking-at (diary-fancy-date-pattern)) (setq beg (line-beginning-position))) (goto-char end) (forward-line 0) |