[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 59dcd114332 2/2: Fix two warnings in smerge.el
From: |
Stefan Kangas |
Subject: |
master 59dcd114332 2/2: Fix two warnings in smerge.el |
Date: |
Thu, 3 Oct 2024 19:40:33 -0400 (EDT) |
branch: master
commit 59dcd1143320ada0244aa309c98a0afa5f2eb5f5
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
Fix two warnings in smerge.el
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower): Fix warnings.
---
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)