1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
emacs/lisp/vc
Stefan Monnier 08fba517f6 (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.
2025-06-23 00:00:38 -04:00
..
add-log.el Revert "Correctly fill generated ChangeLog entries" 2025-02-26 07:22:27 +01:00
compare-w.el
cvs-status.el
diff-mode.el ; * lisp/vc/diff-mode.el (diff-mode-shared-map): Document. 2025-05-13 10:09:26 +01:00
diff.el Merge from origin/emacs-30 2025-03-01 10:01:54 -05:00
ediff-diff.el
ediff-help.el
ediff-hook.el
ediff-init.el
ediff-merg.el
ediff-mult.el Guard against user saving ediff-meta-diff-buffer 2025-03-09 08:10:17 -03:00
ediff-ptch.el Prefer '(evenp A)' to '(= 0 (% A 2))' 2025-02-17 05:37:10 +01:00
ediff-util.el Adapt ediff to nonstandard layouts 2025-03-21 20:56:12 -04:00
ediff-vers.el Fix unwanted revert file prompt after repeated vc-ediff (bug#11605) 2025-03-04 11:58:15 +08:00
ediff-wind.el ; * lisp/vc/ediff-wind.el (ediff-with-live-window): Use cl-once-only 2025-04-07 10:19:58 +08:00
ediff.el ediff-current-file: New optional startup-hooks arg 2025-04-05 09:36:29 +08:00
emerge.el Fix emerge.el for remote files 2025-04-20 18:16:14 +02:00
log-edit.el ; * lisp/vc/log-edit.el (log-edit-show-diff): Insert comma. 2025-06-12 11:17:27 +01:00
log-view.el New user option: vc-allow-async-diff 2025-06-13 06:00:52 +03:00
pcvs-defs.el
pcvs-info.el
pcvs-parse.el
pcvs-util.el Prefer decf to cl-decf 2025-02-23 00:38:22 +01:00
pcvs.el Fix regression in 'kill-this-buffer' (bug#78809) 2025-06-17 16:08:32 +02:00
smerge-mode.el (smerge-refine-shadow-cursor): New variable and face (bug#78806) 2025-06-23 00:00:38 -04:00
vc-annotate.el New user option: vc-allow-async-diff 2025-06-13 06:00:52 +03:00
vc-bzr.el VC: Deprecate log-incoming and log-outgoing backend functions 2025-06-06 09:53:32 +01:00
vc-cvs.el Delete redundant lambdas around unary functions 2025-02-11 19:04:00 +01:00
vc-dir.el New user option vc-dir-hide-up-to-date-on-revert 2025-05-29 12:53:51 +01:00
vc-dispatcher.el vc-finish-logentry: Fix syncing buffers: include whole fileset 2025-06-12 11:15:56 +01:00
vc-filewise.el
vc-git.el New user option: vc-allow-async-diff 2025-06-13 06:00:52 +03:00
vc-hg.el New user option: vc-allow-async-diff 2025-06-13 06:00:52 +03:00
vc-hooks.el Move a vc option to a preloaded file 2025-04-01 14:16:02 -03:00
vc-rcs.el New user option: vc-allow-async-diff 2025-06-13 06:00:52 +03:00
vc-sccs.el
vc-src.el
vc-svn.el New buffer-local vc-buffer-overriding-fileset and vc-buffer-revision 2025-04-11 11:46:05 +08:00
vc.el ; * lisp/vc/vc.el (vc-checkin): Fix thinko. 2025-06-21 19:03:54 +01:00