master aedfb4f0483: (gitmerge-mode-font-lock-keywords): Don't use font-lock-*-face vars

[Stefan Monnier]

branch: master
commit aedfb4f04837ef7b6f50d6a9d833a3ec0f33b11d
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    (gitmerge-mode-font-lock-keywords): Don't use font-lock-*-face vars
    
    * admin/gitmerge.el (gitmerge-mode-font-lock-keywords): Refer to the
    faces directly.
---
 admin/gitmerge.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 7c815c729e5..32d5c3c1bea 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -111,10 +111,10 @@ If nil, the function `gitmerge-default-branch' guesses.")
 
 (defvar gitmerge-mode-font-lock-keywords
   `((,gitmerge-log-regexp
-     (1 font-lock-warning-face)
-     (2 font-lock-constant-face)
-     (3 font-lock-builtin-face)
-     (4 font-lock-comment-face))))
+     (1 'font-lock-warning-face)
+     (2 'font-lock-constant-face)
+     (3 'font-lock-builtin-face)
+     (4 'font-lock-comment-face))))
 
 (defvar gitmerge--commits nil)
 (defvar gitmerge--from nil)