diff options
| author | Stefan Monnier | 2024-02-05 14:50:45 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2024-02-05 14:51:03 -0500 |
| commit | aedfb4f04837ef7b6f50d6a9d833a3ec0f33b11d (patch) | |
| tree | 45b173007b487fa0d4375fe6c0d3bec4fd1eb6d1 /admin | |
| parent | 5e69376292994ffe69b7f8f52ae1ad85c60c2d29 (diff) | |
| download | emacs-aedfb4f04837ef7b6f50d6a9d833a3ec0f33b11d.tar.gz emacs-aedfb4f04837ef7b6f50d6a9d833a3ec0f33b11d.zip | |
(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.el | 8 |
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.") | |||
| 111 | 111 | ||
| 112 | (defvar gitmerge-mode-font-lock-keywords | 112 | (defvar gitmerge-mode-font-lock-keywords |
| 113 | `((,gitmerge-log-regexp | 113 | `((,gitmerge-log-regexp |
| 114 | (1 font-lock-warning-face) | 114 | (1 'font-lock-warning-face) |
| 115 | (2 font-lock-constant-face) | 115 | (2 'font-lock-constant-face) |
| 116 | (3 font-lock-builtin-face) | 116 | (3 'font-lock-builtin-face) |
| 117 | (4 font-lock-comment-face)))) | 117 | (4 'font-lock-comment-face)))) |
| 118 | 118 | ||
| 119 | (defvar gitmerge--commits nil) | 119 | (defvar gitmerge--commits nil) |
| 120 | (defvar gitmerge--from nil) | 120 | (defvar gitmerge--from nil) |