Skip to content

Fix cl-assertion-failed in diff-hl-revert-hunk caused by track-changes #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamescherti wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix cl-assertion-failed in diff-hl-revert-hunk caused by track-changes #287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions diff-hl.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,12 +1037,15 @@ that file, if it's present."
(progn
(vc-setup-buffer diff-buffer)
(with-current-buffer buffer
;; Ensure that the buffer-local variable value is applied.
(diff-hl-diff-against-reference file backend diff-buffer))
(diff-mode)
(setq-local diff-vc-backend backend)
(setq-local diff-vc-revisions (list diff-hl-reference-revision nil))
(setq buffer-read-only t)
(with-current-buffer diff-buffer
;; Prevent diff-mode from registering track-changes for this
;; temporary buffer
(cl-letf (((symbol-function 'track-changes-register) #'ignore))
(diff-mode))
(setq-local diff-vc-backend backend)
(setq-local diff-vc-revisions (list diff-hl-reference-revision nil))
(setq buffer-read-only t))
(pop-to-buffer diff-buffer)
(vc-run-delayed
(vc-diff-finish diff-buffer nil)
Expand Down
Loading