Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Stefan Monnier 2025-06-26 12:55:27 -04:00
parent 80cb688b04
commit a002ca79ee
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/vc/smerge-mode.el
View file

@ -1093,10 +1093,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