From aea5557f847c3578e0570df0934abc215cb5746f Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 7 Dec 2025 15:30:07 +0000 Subject: [PATCH] diff-hl--resolve: Use vc-run-delayed-success on Emacs >=31 Eventually this can replace diff-hl's custom replacement for vc-exec-after. --- diff-hl.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/diff-hl.el b/diff-hl.el index e61c40f4..4837ef16 100644 --- a/diff-hl.el +++ b/diff-hl.el @@ -740,9 +740,13 @@ Return a list of line overlays used." (defun diff-hl--resolve (value-or-buffer cb) (if (listp value-or-buffer) (funcall cb value-or-buffer) - (diff-hl--when-done value-or-buffer - #'diff-hl-changes-from-buffer - cb))) + (static-if (>= emacs-major-version 31) + (with-current-buffer value-or-buffer + (vc-run-delayed-success 1 + (funcall cb (diff-hl-changes-from-buffer (current-buffer))))) + (diff-hl--when-done value-or-buffer + #'diff-hl-changes-from-buffer + cb)))) (defun diff-hl--when-done (buffer get-value callback &optional proc) (let ((proc (or proc (get-buffer-process buffer))))