mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

Fix two warnings in smerge.el

Browse Source 
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower): Fix warnings.
This commit is contained in:
Stefan Kangas 2024-10-04 01:37:31 +02:00
parent e20ce5fcc5
commit 59dcd11433
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/vc/smerge-mode.el
View File

@ -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)