From 7c194efc8a2a4de7b065de705e47829d974f2fd0 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Fri, 20 Mar 2020 23:42:44 +0100
Subject: [PATCH] smerge-mode: Continue to extend faces to edge of window

Due to a breaking change we have to request this explicitly in
Emacs 27.  Earlier Emacs versions do the right thing by default.
---
 init.el | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/init.el b/init.el
index f349ac8..8fb5150 100644
--- a/init.el
+++ b/init.el
@@ -142,6 +142,14 @@
 (use-package simple
   :config (column-number-mode))
 
+(use-package smerge-mode
+  :defer t
+  :config
+  (when (>= emacs-major-version 27)
+    (set-face-attribute 'smerge-refined-changed nil :extend t)
+    (set-face-attribute 'smerge-refined-removed nil :extend t)
+    (set-face-attribute 'smerge-refined-added   nil :extend t)))
+
 (progn ;    `text-mode'
   (add-hook 'text-mode-hook #'indicate-buffer-boundaries-left))