]> git.eshelyaron.com Git - emacs.git/commit
(smerge-refine-shadow-cursor): New variable and face (bug#78806)
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 16 Jun 2025 11:05:11 +0000 (07:05 -0400)
committerEshel Yaron <me@eshelyaron.com>
Wed, 23 Jul 2025 18:58:24 +0000 (20:58 +0200)
commit8895afb1807d1e3554ca999906b7fb38df70c508
tree34d03edd30318348aa3de88313b8ea4ad8fffb3f
parent08d6d8b71bbcaef3951e93cc20ade6e4f1903637
(smerge-refine-shadow-cursor): New variable and face (bug#78806)

* lisp/vc/smerge-mode.el (smerge-refine-shadow-cursor): New variable
and face.
(smerge-refine-regions): Add 'cursor-sensor-functions' property
to the covering overlays.
(smerge--refine-at-right-margin-p, smerge--refine-shadow-cursor):
New functions.
(smerge--refine-other-pos): New function, extracted from
smerge-refine-exchange-point'.
(smerge-refine-exchange-point): Use it.
(smerge--refine-highlight-change): Add thin
highlighted space for insertion/deletion positions.

* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor--detect):
Run functions for 'moved' events.  Demote errors.
(cursor-sensor-mode): Adjust docstring accordingly.

* doc/lispref/text.texi (Special Properties) <cursor-sensor-functions>:
Mention the new 'moved' direction.

(cherry picked from commit 08fba517f66794f817c3e6101a80ce3df1798581)
doc/lispref/text.texi
lisp/emacs-lisp/cursor-sensor.el
lisp/vc/smerge-mode.el