From 8f072b9f6b19f38f2967cd24b962de95afd6b52a Mon Sep 17 00:00:00 2001 From: Sebastian Weddmark Olsson Date: Thu, 7 Sep 2023 06:05:35 +0200 Subject: [PATCH 1/4] linum-mode fix for new emacs --- elisp/edts/edts-shell.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/elisp/edts/edts-shell.el b/elisp/edts/edts-shell.el index ceb6001b..4e651641 100644 --- a/elisp/edts/edts-shell.el +++ b/elisp/edts/edts-shell.el @@ -143,7 +143,9 @@ PWD and running COMMAND." (ignore-errors (make-local-variable 'show-paren-mode) (show-paren-mode 1)) - (linum-mode -1) + (if (version<= "26.0.50" emacs-version) + (display-line-numbers-mode -1) + (linum-mode -1)) (setq show-trailing-whitespace nil) (set-process-query-on-exit-flag (get-buffer-process (current-buffer)) nil) (add-hook 'kill-buffer-hook #'edts-shell--kill-buffer-hook t t) From e2723110e852e11e2d76aa5d3b96a27d5103fe5c Mon Sep 17 00:00:00 2001 From: Sebastian Weddmark Olsson Date: Fri, 8 Sep 2023 08:04:37 +0200 Subject: [PATCH 2/4] upgrade tests --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e4322948..be6854ca 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,11 +12,11 @@ on: jobs: test: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 name: OTP ${{matrix.otp}} strategy: matrix: - otp: [20.3.8.26, 21.3.8.17, 22.3.4.9, 23.3.1, 24.0.5] + otp: [22.3.4.9, 23.3.1, 24.3.3, 25.3.1] emacs: [27.1] # 24.5, 26.3, steps: From c589209eed8bb26863a8854c9bc6ad72cc41d9e2 Mon Sep 17 00:00:00 2001 From: Sebastian Weddmark Olsson Date: Fri, 8 Sep 2023 10:08:02 +0200 Subject: [PATCH 3/4] use ubuntu-20.04 for github actions --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index be6854ca..2858cfcc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,11 +12,11 @@ on: jobs: test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 name: OTP ${{matrix.otp}} strategy: matrix: - otp: [22.3.4.9, 23.3.1, 24.3.3, 25.3.1] + otp: [22.3.4.9, 23.3.4.5, 24.3.3, 25.3.1] emacs: [27.1] # 24.5, 26.3, steps: From a4e0a06288d542f472c4a04da1c78c099ac403d1 Mon Sep 17 00:00:00 2001 From: Sebastian Weddmark Olsson Date: Fri, 8 Sep 2023 10:51:48 +0200 Subject: [PATCH 4/4] correct OTP 25.3 version --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2858cfcc..7c9bc7a1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ jobs: name: OTP ${{matrix.otp}} strategy: matrix: - otp: [22.3.4.9, 23.3.4.5, 24.3.3, 25.3.1] + otp: [22.3.4.9, 23.3.4.5, 24.3.3, 25.3] emacs: [27.1] # 24.5, 26.3, steps: