Skip to content

Commit bb9af85

Browse files
committed
Change the workaround for #230 to allow the non-thread method [macOS]
1 parent bdb3641 commit bb9af85

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

diff-hl.el

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -485,12 +485,14 @@ It can be a relative expression as well, such as \"HEAD^\" with Git, or
485485
(hide-staged (and (eq backend 'Git) (not diff-hl-show-staged-changes))))
486486
(when backend
487487
(let ((state (vc-state file backend))
488-
;; Workaround for debbugs#78946.
488+
;; Workaround for debbugs#78946 for the `thread' async update method.
489489
;; This is fiddly, but we basically allow the thread to start, while
490490
;; prohibiting the async process call inside.
491-
;; That still makes it partially async.
492-
(diff-hl-update-async (and (not (eq window-system 'ns))
493-
(eq diff-hl-update-async t))))
491+
;; That still makes it partially async on macOS.
492+
;; Or just use "simple async" if your Emacs is new enough.
493+
(diff-hl-update-async (or (and (eq diff-hl-update-async 'thread)
494+
(not (eq window-system 'ns)))
495+
(eq diff-hl-update-async t))))
494496
(cond
495497
((and
496498
(not diff-hl-highlight-reference-function)

0 commit comments

Comments
 (0)