From 094723993297338955d73862f41cc80138703026 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Wed, 27 Dec 2023 10:28:28 +0100 Subject: [PATCH] Support Emacs 26.1 again Since [1: 1ebac69] Emacs 26.1 effectively wasn't supported anymore and [2: fa83e81] made that formal, but we should support that release at least a while longer, which do by using the Compat package. 1: 2023-07-18 1ebac695db1632585c8b832fcc8909adfcbf4e31 package-recipe-validate-all: Report progress 2: 2023-12-24 fa83e8113fcaa1ffe4c67ede8ab038b6985f5de5 Fix CI build by requiring a newer Emacs --- Makefile | 4 ++++ default.mk | 2 +- package-build.el | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7c5368c..b5c7b23 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,10 @@ include default.mk .PHONY: test +# https://github.com/emacscollective/workflows/blob/main/bin/install-deps +# expects this to find this in this file. +DEPS = compat + all: lisp help: diff --git a/default.mk b/default.mk index 6829fcf..9233d24 100644 --- a/default.mk +++ b/default.mk @@ -8,7 +8,7 @@ ELS += package-build.el ELS += package-recipe-mode.el ELCS = $(ELS:.el=.elc) -DEPS = +DEPS = compat VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0 | cut -c2-) diff --git a/package-build.el b/package-build.el index fb63299..a3fa281 100644 --- a/package-build.el +++ b/package-build.el @@ -13,7 +13,7 @@ ;; Keywords: maint tools ;; Package-Version: 4.0.0.50-git -;; Package-Requires: ((emacs "27.1")) +;; Package-Requires: ((emacs "26.1") (compat "27.1")) ;; SPDX-License-Identifier: GPL-3.0-or-later