branch: elpa/magit commit 08dafc1732119663ef8e81c681da1f881bb12a0d Author: Jonas Bernoulli <jo...@bernoul.li> Commit: Jonas Bernoulli <jo...@bernoul.li>
Require the Cond-Let package --- default.mk | 10 ++++++++++ lisp/magit-base.el | 1 + lisp/magit-section.el | 2 ++ lisp/magit.el | 1 + 4 files changed, 14 insertions(+) diff --git a/default.mk b/default.mk index f5316c28708..15292c1066c 100644 --- a/default.mk +++ b/default.mk @@ -146,6 +146,13 @@ ifeq "$(COMPAT_DIR)" "" COMPAT_DIR = $(TOP)../compat endif +COND_LET_DIR ?= $(shell \ + find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/compat-[.0-9]*' 2> /dev/null | \ + sort | tail -n 1) +ifeq "$(COND_LET_DIR)" "" + COND_LET_DIR = $(TOP)../cond-let +endif + LLAMA_DIR ?= $(shell \ find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/llama-[.0-9]*' 2> /dev/null | \ sort | tail -n 1) @@ -192,6 +199,7 @@ LOAD_PATH = -L $(TOP)lisp ifdef CYGPATH LOAD_PATH += -L $(shell cygpath --mixed $(COMPAT_DIR)) + LOAD_PATH += -L $(shell cygpath --mixed $(COND_LET_DIR)) LOAD_PATH += -L $(shell cygpath --mixed $(LLAMA_DIR)) LOAD_PATH += -L $(shell cygpath --mixed $(SEQ_DIR)) LOAD_PATH += -L $(shell cygpath --mixed $(TRANSIENT_DIR)) @@ -201,6 +209,7 @@ ifdef CYGPATH endif else LOAD_PATH += -L $(COMPAT_DIR) + LOAD_PATH += -L $(COND_LET_DIR) LOAD_PATH += -L $(LLAMA_DIR) LOAD_PATH += -L $(SEQ_DIR) LOAD_PATH += -L $(TRANSIENT_DIR) @@ -221,6 +230,7 @@ endif # This isn't used by make, but is needed for the Compile ci workflow. DEPS = compat +DEPS += cond-let DEPS += llama DEPS += seq DEPS += transient/lisp diff --git a/lisp/magit-base.el b/lisp/magit-base.el index 3e4c3191bce..fbae65c6b20 100644 --- a/lisp/magit-base.el +++ b/lisp/magit-base.el @@ -38,6 +38,7 @@ (require 'cl-lib) (require 'compat) +(require 'cond-let) (require 'eieio) (require 'llama) (require 'subr-x) diff --git a/lisp/magit-section.el b/lisp/magit-section.el index 0e7526d3dd2..c1911d7d799 100644 --- a/lisp/magit-section.el +++ b/lisp/magit-section.el @@ -12,6 +12,7 @@ ;; Package-Requires: ( ;; (emacs "28.1") ;; (compat "30.1") +;; (cond-let "0.1") ;; (llama "1.0") ;; (seq "2.24")) @@ -44,6 +45,7 @@ (require 'cl-lib) (require 'compat) +(require 'cond-let) (require 'eieio) (require 'llama) (require 'subr-x) diff --git a/lisp/magit.el b/lisp/magit.el index af54b01aa77..3a6a24e995d 100644 --- a/lisp/magit.el +++ b/lisp/magit.el @@ -21,6 +21,7 @@ ;; Package-Requires: ( ;; (emacs "28.1") ;; (compat "30.1") +;; (cond-let "0.1") ;; (llama "1.0") ;; (magit-section "4.3.8") ;; (seq "2.24")