mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-23 07:19:15 +00:00
(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.
This commit is contained in:
parent
5e69376292
commit
aedfb4f048
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user