From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 26 Jun 2025 16:55:27 +0000 (-0400)
Subject: lisp/vc/smerge-mode.el (smerge--refine-highlight-change): Fix misalignment
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d1be5112c5c7a7ef18838e98bca3d5efa1214082;p=emacs.git

lisp/vc/smerge-mode.el (smerge--refine-highlight-change): Fix misalignment

(cherry picked from commit a002ca79ee7f536cb2293af1c7e712a251638fbf)
---

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 4b748a2c41e..1ddc37d57fe 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -1089,10 +1089,14 @@ chars to try and eliminate some spurious differences."
                     (not (memq (car-safe x) '(face font-lock-face))))
                 (overlay-put ol (car x) (cdr x))
               ;; Don't highlight the char we cover artificially.
-              (overlay-put ol (if (= beg olbeg) 'before-string 'after-string)
-                           (propertize
-                            " " (car-safe x) (cdr-safe x)
-                            'display '(space :width 0.5)))))
+              ;; FIXME: We don't want to insert any space because it
+              ;; causes misalignment.  A `:box' face with a line
+              ;; only on one side would be a good solution.
+              ;; (overlay-put ol (if (= beg olbeg) 'before-string 'after-string)
+              ;;              (propertize
+              ;;               " " (car-safe x) (cdr-safe x)
+              ;;               'display '(space :width 0.5)))
+              ))
           ol)))))
 
 (defcustom smerge-refine-shadow-cursor t