Skip to content

Commit 08243a6

Browse files
committed
Fix a freeze on macOS (ns port)
Reported in #230.
1 parent 5663656 commit 08243a6

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

diff-hl.el

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,13 @@ It can be a relative expression as well, such as \"HEAD^\" with Git, or
388388
(let* ((file buffer-file-name)
389389
(backend (vc-backend file)))
390390
(when backend
391-
(let ((state (vc-state file backend)))
391+
(let ((state (vc-state file backend))
392+
;; Workaround for debbugs#78946.
393+
;; This is fiddly, but we basically allow the thread to start, while
394+
;; prohibiting the async process call inside.
395+
;; That still makes it partially async.
396+
(diff-hl-update-async (and diff-hl-update-async
397+
(not (eq window-system 'ns)))))
392398
(cond
393399
((diff-hl-modified-p state)
394400
(diff-hl-changes-from-buffer

0 commit comments

Comments
 (0)