summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2024-02-05 14:50:45 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2024-02-05 14:51:03 -0500
commitaedfb4f04837ef7b6f50d6a9d833a3ec0f33b11d (patch)
tree45b173007b487fa0d4375fe6c0d3bec4fd1eb6d1 /admin
parent5e69376292994ffe69b7f8f52ae1ad85c60c2d29 (diff)
downloademacs-aedfb4f04837ef7b6f50d6a9d833a3ec0f33b11d.tar.gz
(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.
Diffstat (limited to 'admin')
-rw-r--r--admin/gitmerge.el8
1 files 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)