(log-view-font-lock-keywords): Use `eval' so as to adapt to buffer settings.

2 files changed, 15 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43508f79101..713ad4d3bf6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-08-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * log-view.el (log-view-font-lock-keywords): Use `eval' so as to adapt
+        to buffer-local settings.
+
         * emacs-lisp/backquote.el (backquote-delay-process): New function.
         (backquote-process): Add internal arg `level'.  Use the two to
         correctly handle nested backquotes.
diff --git a/lisp/log-view.el b/lisp/log-view.el
index 6a1fc9a11b1..41e689f0025 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -160,14 +160,18 @@
           (concat "\\|[^ \n].*[^0-9\n][0-9][0-9]:[0-9][0-9][^0-9\n].*[^ \n]"
                   ;;Email of user and finally Msg, used as revision name.
                   "  .*@.*\n\\(?:  \\* \\(.*\\)\\)?")
-          "\\)$"))
-
-(defconst log-view-font-lock-keywords
-  `((,log-view-file-re
-     (1 (if (boundp 'cvs-filename-face) cvs-filename-face) nil t)
-     (2 (if (boundp 'cvs-filename-face) cvs-filename-face) nil t)
-     (0 log-view-file-face append))
-    (,log-view-message-re . log-view-message-face)))
+          "\\)$")
+  "Regexp matching the text identifying a revision.")
+
+(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) nil t)
+              (2 (if (boundp 'cvs-filename-face) cvs-filename-face) nil t)
+              (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))