diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2025-08-22 20:55:31 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2025-08-22 20:55:31 +0200 |
| commit | 08dafc1732119663ef8e81c681da1f881bb12a0d (patch) | |
| tree | a734bba665cee2ff659c72a83ac68bbd353233f3 | |
| parent | da52ac901247b12241504e9baf89275c13b41def (diff) | |
Require the Cond-Let package
| -rw-r--r-- | default.mk | 10 | ||||
| -rw-r--r-- | lisp/magit-base.el | 1 | ||||
| -rw-r--r-- | lisp/magit-section.el | 2 | ||||
| -rw-r--r-- | lisp/magit.el | 1 |
4 files changed, 14 insertions, 0 deletions
@@ -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 3e4c319..fbae65c 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 0e7526d..c1911d7 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 af54b01..3a6a24e 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") |