Merge branch 'master' into reference-revision-highlights

Author: dgutov

.github/workflows/ci.yml

@@ -0,0 +1,39 @@
+name: CI
+
+on:
+  push:
+    paths:
+      - '**.el'
+      - '**ci.yml'
+      - 'Makefile'
+    branches:
+      - master
+
+  pull_request:
+    paths:
+      - '**.el'
+      - '**ci.yml'
+      - 'Makefile'
+    branches:
+      - master
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        emacs_version: [26.1, 26.3, 27.2, 28.2, 29.4, snapshot]
+
+    steps:
+      - name: Setup Emacs
+        uses: purcell/setup-emacs@master
+        with:
+          version: ${{ matrix.emacs_version }}
+
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Run tests
+        run: make test

Makefile

@@ -15,7 +15,7 @@ RM ?= rm -f
 all: compile test
 
 test:
-	$(EMACS) -batch -L . -l test/diff-hl-test.el -f diff-hl-run-tests
+	$(EMACS) -batch -L . -l test/diff-hl-test.el -f ert-run-tests-batch-and-exit
 
 compile:
 	$(EMACS) -batch -L . -f batch-byte-compile $(SOURCES)

README.md

@@ -1,4 +1,4 @@
-About
+About [![Build Status](https://github.com/dgutov/diff-hl/actions/workflows/ci.yml/badge.svg)](https://github.com/dgutov/diff-hl/actions/workflows/ci.yml)
 =====
 
 `diff-hl-mode` highlights uncommitted changes on the side of the window (area

diff-hl.el

@@ -551,7 +551,10 @@ contents as they are (or would be) after applying the changes in NEW."
                                               default-directory)))
       ;; TODO: debounce if a thread is already running.
       (let ((buf (current-buffer))
-            (temp-buffer (generate-new-buffer " *temp*" t)))
+            (temp-buffer
+             (if (< emacs-major-version 28)
+                 (generate-new-buffer " *temp*")
+               (generate-new-buffer " *temp*" t))))
         ;; Switch buffer temporarily, to "unlock" it for other threads.
         (with-current-buffer temp-buffer
           (make-thread

test/diff-hl-test.el

@@ -127,6 +127,7 @@
     (should-error (diff-hl-next-hunk) :type 'user-error)))
 
 (diff-hl-deftest diff-hl-indirect-buffer-move-async ()
+  (skip-unless (>= emacs-major-version 27)) ;No `main-thread'.
   (diff-hl-test-in-source
    (let ((diff-hl-update-async t))
      (narrow-to-region (point-min) (point-max))
@@ -215,9 +216,6 @@
 
 "))))))
 
-(defun diff-hl-run-tests ()
-  (ert-run-tests-batch))
-
 (provide 'diff-hl-test)
 
 ;;; diff-hl-test.el ends here