From dacfefb0d74777ae003232ad42330cd82a39fbdc Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 4 Oct 2024 01:37:31 +0200 Subject: [PATCH] Fix two warnings in smerge.el * lisp/vc/smerge-mode.el (smerge-upper, smerge-lower): Fix warnings. (cherry picked from commit 59dcd1143320ada0244aa309c98a0afa5f2eb5f5) --- lisp/vc/smerge-mode.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index a16c7871ff9..aad3e302826 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -81,7 +81,7 @@ Used in `smerge-diff-base-upper' and related functions." (((class color) (min-colors 88) (background dark)) :background "#553333" :extend t) (((class color)) - :foreground "red" :extend)) + :foreground "red" :extend t)) "Face for the `upper' version of a conflict.") (define-obsolete-face-alias 'smerge-mine 'smerge-upper "26.1") (defvar smerge-upper-face 'smerge-upper) @@ -92,7 +92,7 @@ Used in `smerge-diff-base-upper' and related functions." (((class color) (min-colors 88) (background dark)) :background "#335533" :extend t) (((class color)) - :foreground "green" :extend)) + :foreground "green" :extend t)) "Face for the `lower' version of a conflict.") (define-obsolete-face-alias 'smerge-other 'smerge-lower "26.1") (defvar smerge-lower-face 'smerge-lower) -- 2.39.2