Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions diff-hl.el
Original file line number Diff line number Diff line change
Expand Up @@ -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))))
Expand Down