From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 5 Feb 2024 19:50:45 +0000 (-0500)
Subject: (gitmerge-mode-font-lock-keywords): Don't use font-lock-*-face vars
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6137c7bf5ceb739165a2bcaef19d20588d5f3ed5;p=emacs.git

(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.

(cherry picked from commit aedfb4f04837ef7b6f50d6a9d833a3ec0f33b11d)
---

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)