From: Stefan Monnier Date: Wed, 20 Jun 2007 18:18:31 +0000 (+0000) Subject: (log-view-font-lock-keywords): Use `eval' to consult the X-Git-Tag: emacs-pretest-23.0.90~12192 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=18b2e5b9ab9146cca37978d5fa0f09d2ab4a4cc2;p=emacs.git (log-view-font-lock-keywords): Use `eval' to consult the buffer-local value of log-view-*-re if applicable. --- diff --git a/lisp/log-view.el b/lisp/log-view.el index bf029045a8c..5962c216624 100644 --- a/lisp/log-view.el +++ b/lisp/log-view.el @@ -128,13 +128,13 @@ (put 'log-view-message-face 'face-alias 'log-view-message) (defvar log-view-message-face 'log-view-message) -(defconst log-view-file-re +(defvar log-view-file-re (concat "^\\(?:Working file: \\(?1:.+\\)" ;RCS and CVS. ;; Subversion has no such thing?? "\\|\\(?:SCCS/s\\.\\|Changes to \\)\\(?1:.+\\):" ;SCCS and Darcs. "\\)\n")) ;Include the \n for font-lock reasons. -(defconst log-view-message-re +(defvar log-view-message-re (concat "^\\(?:revision \\(?1:[.0-9]+\\)\\(?:\t.*\\)?" ; RCS and CVS. "\\|r\\(?1:[0-9]+\\) | .* | .*" ; Subversion. "\\|D \\(?1:[.0-9]+\\) .*" ; SCCS. @@ -149,11 +149,13 @@ " .*@.*\n\\(?: \\* \\(?1:.*\\)\\)?") "\\)$")) -(defconst log-view-font-lock-keywords - `((,log-view-file-re - (1 (if (boundp 'cvs-filename-face) cvs-filename-face)) - (0 log-view-file-face append)) - (,log-view-message-re . log-view-message-face))) +(defvar log-view-font-lock-keywords + ;; We use `eval' so as to use the buffer-local value of log-view-file-re + ;; and log-view-message-re, if applicable. + '((eval . `(,log-view-file-re + (1 (if (boundp 'cvs-filename-face) cvs-filename-face)) + (0 log-view-file-face append))) + (eval . `(,log-view-message-re . log-view-message-face)))) (defconst log-view-font-lock-defaults '(log-view-font-lock-keywords t nil nil nil))