branch: elpa/magit
commit 0a649821007e643ab8c13e770e2a2e10b0389bc4
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
Prepare for the arrival of domesticated South American camelids
---
CHANGELOG | 2 ++
default.mk | 10 ++++++++++
lisp/magit-base.el | 1 +
lisp/magit-section.el | 2 ++
lisp/magit.el | 1 +
5 files changed, 16 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 3e46b3c02cf..dabec2a02b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -82,6 +82,8 @@ Bug fixes:
exists in Emacs since 29.1, so this will only help users stuck
on Emacs 28. #5300
+- Began using the ~##~ macro from the ~llama~ package.
+
* v4.2.0 2025-01-01
- At least Git 2.25.0 is required now. 033a0c0cdc
diff --git a/default.mk b/default.mk
index 501340c66f4..170b46d5da6 100644
--- a/default.mk
+++ b/default.mk
@@ -152,6 +152,13 @@ ifeq "$(DASH_DIR)" ""
DASH_DIR = $(TOP)../dash
endif
+LLAMA_DIR ?= $(shell \
+ find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/llama-[.0-9]*' 2> /dev/null | \
+ sort | tail -n 1)
+ifeq "$(LLAMA_DIR)" ""
+ LLAMA_DIR = $(TOP)../llama
+endif
+
SEQ_DIR ?= $(shell \
find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/seq-[.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 $(DASH_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))
LOAD_PATH += -L $(shell cygpath --mixed $(WITH_EDITOR_DIR))
@@ -201,6 +209,7 @@ ifdef CYGPATH
else
LOAD_PATH += -L $(COMPAT_DIR)
LOAD_PATH += -L $(DASH_DIR)
+ LOAD_PATH += -L $(LLAMA_DIR)
LOAD_PATH += -L $(SEQ_DIR)
LOAD_PATH += -L $(TRANSIENT_DIR)
LOAD_PATH += -L $(WITH_EDITOR_DIR)
@@ -221,6 +230,7 @@ endif
DEPS = compat
DEPS += dash
+DEPS += llama
DEPS += seq
DEPS += transient/lisp
DEPS += vterm
diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index 393d3e10185..1834c9b0d87 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -39,6 +39,7 @@
(require 'compat)
(require 'dash)
(require 'eieio)
+(require 'llama)
(require 'subr-x)
;; For older Emacs releases we depend on an updated `seq' release from
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 6ca2f6b65d7..d3e2289d112 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -13,6 +13,7 @@
;; (emacs "27.1")
;; (compat "30.0.1.0")
;; (dash "2.19.1")
+;; (llama "0.6.0")
;; (seq "2.24"))
;; SPDX-License-Identifier: GPL-3.0-or-later
@@ -46,6 +47,7 @@
(require 'compat)
(require 'dash)
(require 'eieio)
+(require 'llama)
(require 'subr-x)
;; For older Emacs releases we depend on an updated `seq' release from GNU
diff --git a/lisp/magit.el b/lisp/magit.el
index 34b6f60515a..1b65238942c 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -22,6 +22,7 @@
;; (emacs "27.1")
;; (compat "30.0.1.0")
;; (dash "2.19.1")
+;; (llama "0.6.0")
;; (magit-section "4.2.0")
;; (seq "2.24")
;; (transient "0.8.2")
