branch: elpa/git-commit
commit 571b4346c1057cd504ddb6497c6b35c5d38eaa61
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
Depend on the compat package from GNU Elpa
---
default.mk | 11 +++++++++++
lisp/git-commit-pkg.el | 1 +
lisp/git-commit.el | 2 +-
lisp/magit-base.el | 3 +++
lisp/magit-libgit-pkg.el | 1 +
lisp/magit-libgit.el | 5 ++++-
lisp/magit-pkg.el | 1 +
lisp/magit-section-pkg.el | 1 +
lisp/magit-section.el | 5 ++++-
lisp/magit.el | 2 +-
10 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/default.mk b/default.mk
index e102c9c218..a7544e1672 100644
--- a/default.mk
+++ b/default.mk
@@ -111,6 +111,7 @@ VERSION ?= $(shell \
git describe --tags --abbrev=0 --always | cut -c2-)
TIMESTAMP = 20211004
+COMPAT_VERSION = 28.1.0.4
DASH_VERSION = 2.19.1
GIT_COMMIT_VERSION = $(VERSION)
LIBGIT_VERSION = 0
@@ -120,6 +121,7 @@ MAGIT_SECTION_VERSION = $(VERSION)
TRANSIENT_VERSION = 0.3.6
WITH_EDITOR_VERSION = 3.0.5
+COMPAT_SNAPSHOT = 28.1.0.4
DASH_MELPA_SNAPSHOT = 20210826
GIT_COMMIT_MELPA_SNAPSHOT = $(TIMESTAMP)
LIBGIT_MELPA_SNAPSHOT = 0
@@ -152,6 +154,13 @@ endif
ELPA_DIR ?= $(USER_EMACS_DIR)/elpa
+COMPAT_DIR ?= $(shell \
+ find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/compat-[.0-9]*' 2> /dev/null | \
+ sort | tail -n 1)
+ifeq "$(COMPAT_DIR)" ""
+ COMPAT_DIR = $(TOP)../compat
+endif
+
DASH_DIR ?= $(shell \
find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/dash-[.0-9]*' 2> /dev/null | \
sort | tail -n 1)
@@ -197,6 +206,7 @@ LOAD_PATH = -L $(TOP)lisp
# info node accordingly. Also don't forget to "rgrep \b<pkg>\b".
ifdef CYGPATH
+ LOAD_PATH += -L $(shell cygpath --mixed $(COMPAT_DIR))
LOAD_PATH += -L $(shell cygpath --mixed $(DASH_DIR))
LOAD_PATH += -L $(shell cygpath --mixed $(LIBGIT_DIR))
LOAD_PATH += -L $(shell cygpath --mixed $(TRANSIENT_DIR))
@@ -205,6 +215,7 @@ ifdef CYGPATH
LOAD_PATH += -L $(shell cygpath --mixed $(MAGIT_SECTION_DIR))
endif
else
+ LOAD_PATH += -L $(COMPAT_DIR)
LOAD_PATH += -L $(DASH_DIR)
LOAD_PATH += -L $(LIBGIT_DIR)
LOAD_PATH += -L $(TRANSIENT_DIR)
diff --git a/lisp/git-commit-pkg.el b/lisp/git-commit-pkg.el
index 4461f6dd2b..6fe8fe152d 100644
--- a/lisp/git-commit-pkg.el
+++ b/lisp/git-commit-pkg.el
@@ -1,6 +1,7 @@
(define-package "git-commit" "3.3.0-git"
"Edit Git commit messages."
'((emacs "25.1")
+ (compat "28.1.0.4")
(transient "20210920")
(with-editor "20211001"))
:homepage "https://magit.vc";
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 6f6f8a56d2..132d51bc36 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -13,7 +13,7 @@
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit
-;; Package-Requires: ((emacs "25.1") (transient "0.3.6") (with-editor "3.0.5"))
+;; Package-Requires: ((emacs "25.1") (compat "28.1.0.4") (transient "0.3.6")
(with-editor "3.0.5"))
;; Package-Version: 3.3.0-git
;; SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index d093acb914..91a3aede48 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -39,6 +39,9 @@
(defconst magit--minimal-emacs "25.1")
(require 'cl-lib)
+(require 'compat)
+(require 'compat-26)
+(require 'compat-27)
(require 'dash)
(require 'eieio)
(require 'seq)
diff --git a/lisp/magit-libgit-pkg.el b/lisp/magit-libgit-pkg.el
index b3c41fcb2e..47f1f4b67c 100644
--- a/lisp/magit-libgit-pkg.el
+++ b/lisp/magit-libgit-pkg.el
@@ -1,6 +1,7 @@
(define-package "magit-libgit" "3.3.0-git"
"."
'((emacs "25.1")
+ (compat "28.1.0.4")
(libgit "0")
(magit "20211004"))
:homepage "https://magit.vc";
diff --git a/lisp/magit-libgit.el b/lisp/magit-libgit.el
index 6b0ba87948..812c90a69c 100644
--- a/lisp/magit-libgit.el
+++ b/lisp/magit-libgit.el
@@ -10,7 +10,7 @@
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit
-;; Package-Requires: ((emacs "26.1") (libgit "0") (magit "3.3.0"))
+;; Package-Requires: ((emacs "26.1") (compat "28.1.0.4") (libgit "0") (magit
"3.3.0"))
;; Package-Version: 3.3.0-git
;; SPDX-License-Identifier: GPL-3.0-or-later
@@ -44,6 +44,9 @@
;;; Code:
(require 'cl-lib)
+(require 'compat)
+(require 'compat-26)
+(require 'compat-27)
(require 'dash)
(require 'eieio)
(require 'seq)
diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el
index 8cf3f5a33c..152e046055 100644
--- a/lisp/magit-pkg.el
+++ b/lisp/magit-pkg.el
@@ -1,6 +1,7 @@
(define-package "magit" "3.3.0-git"
"A Git porcelain inside Emacs."
'((emacs "25.1")
+ (compat "28.1.0.4")
(dash "20210826")
(git-commit "20220222")
(magit-section "20220325")
diff --git a/lisp/magit-section-pkg.el b/lisp/magit-section-pkg.el
index 23252b1c81..1289a6a0b3 100644
--- a/lisp/magit-section-pkg.el
+++ b/lisp/magit-section-pkg.el
@@ -1,6 +1,7 @@
(define-package "magit-section" "3.3.0-git"
"Sections for read-only buffers"
'((emacs "25.1")
+ (compat "28.1.0.4")
(dash "20210826"))
:homepage "https://magit.vc";
:keywords '("tools"))
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 47d36cbc9d..74d242c437 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -10,7 +10,7 @@
;; Keywords: tools
;; Homepage: https://github.com/magit/magit
-;; Package-Requires: ((emacs "25.1") (dash "2.19.1"))
+;; Package-Requires: ((emacs "25.1") (compat "28.1.0.4") (dash "2.19.1"))
;; Package-Version: 3.3.0-git
;; SPDX-License-Identifier: GPL-3.0-or-later
@@ -37,6 +37,9 @@
;;; Code:
(require 'cl-lib)
+(require 'compat)
+(require 'compat-26)
+(require 'compat-27)
(require 'dash)
(require 'eieio)
(require 'format-spec)
diff --git a/lisp/magit.el b/lisp/magit.el
index e3dc0e8cce..9b85437ce7 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -19,7 +19,7 @@
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit
-;; Package-Requires: ((emacs "25.1") (dash "2.19.1") (git-commit "3.3.0")
(magit-section "3.3.0") (transient "0.3.6") (with-editor "3.0.5"))
+;; Package-Requires: ((emacs "25.1") (compat "28.1.0.4") (dash "2.19.1")
(git-commit "3.3.0") (magit-section "3.3.0") (transient "0.3.6") (with-editor
"3.0.5"))
;; Package-Version: 3.3.0-git
;; SPDX-License-Identifier: GPL-3.0-or-later
