branch: elpa/magit
commit 2ab34a757503436904b80d0a24feeb45ab1e01c5
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Add missing references to Cond-Let package
Closes #5429.
---
.github/ISSUE_TEMPLATE/bug_report.md | 2 +-
default.mk | 4 ++--
docs/magit.org | 16 +++++++++-------
docs/magit.texi | 16 +++++++++-------
lisp/magit-base.el | 1 +
5 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md
b/.github/ISSUE_TEMPLATE/bug_report.md
index c1fb4a0fc17..3fca28c2172 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -42,7 +42,7 @@ to save a shell command to the `kill-ring` and the system's
clip-board, which yo
Finally, if that didn't work and you have installed Magit from Melpa, then run
commands similar to the ones above, but use tab completion to replace the
various Ns with the correct versions:
$ cd ~/.emacs.d/elpa/magit-N
- $ emacs -Q --debug-init --eval '(setq debug-on-error t)' -L ../llama-N -L
../seq-N -L ../transient-N -L ../with-editor-N -L . -l magit
+ $ emacs -Q --debug-init --eval '(setq debug-on-error t)' -L ../cond-let-N
-L ../llama-N -L ../magit-section -L ../seq-N -L ../transient-N -L
../with-editor-N -L . -l magit
More debugging tools are described in the manual.
diff --git a/default.mk b/default.mk
index 15292c1066c..ea76de4e1d7 100644
--- a/default.mk
+++ b/default.mk
@@ -147,7 +147,7 @@ ifeq "$(COMPAT_DIR)" ""
endif
COND_LET_DIR ?= $(shell \
- find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/compat-[.0-9]*' 2> /dev/null | \
+ find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/cond-let-[.0-9]*' 2> /dev/null | \
sort | tail -n 1)
ifeq "$(COND_LET_DIR)" ""
COND_LET_DIR = $(TOP)../cond-let
@@ -192,7 +192,7 @@ endif
LOAD_PATH = -L $(TOP)lisp
-# When making changes here, then don't forget to adjust "default.mk"
+# When making changes here, then don't forget to adjust DEPS below,
# ".github/ISSUE_TEMPLATE/bug_report.md", `magit-emacs-Q-command' and
# the "Installing from the Git Repository" info node accordingly.
# Also don't forget to "rgrep \b<pkg>\b".
diff --git a/docs/magit.org b/docs/magit.org
index 4c1089cc8fc..bfd5ace7290 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -153,8 +153,8 @@ Now see [[*Post-Installation Tasks]].
** Installing from the Git Repository
-Magit depends on the ~compat~, ~llama~, ~seq~ (the built-in version is
-enough when using Emacs >= 29.1), ~transient~ and ~with-editor~ libraries
+Magit depends on the ~compat~, ~cond-let~, ~llama~, ~seq~ (the built-in version
+is enough when using Emacs >= 29.1), ~transient~ and ~with-editor~ libraries
which are available from Melpa and Melpa-Stable. Install them using
~M-x package-install RET <package> RET~. Of course you may also install
them manually from their repository.
@@ -172,15 +172,16 @@ Then compile the libraries and generate the info manuals:
$ make
#+end_src
-If you haven't installed ~compat~, ~llama~, ~seq~ (for Emacs < 29.1),
-~transient~ and ~with-editor~ from Melpa, or at
-~/path/to/magit/../<package>~, then you have to tell ~make~ where to
-find them. To do so create the file ~/path/to/magit/config.mk~
-with the following content before running ~make~:
+If you haven't installed ~compat~, ~cond-let~, ~llama~, ~seq~
+(only for Emacs 28), ~transient~ and ~with-editor~ from Melpa, or at
+~/path/to/magit/../<package>~, then you have to tell ~make~ where to find
+them. To do so create the file ~/path/to/magit/config.mk~ with the
+following content before running ~make~:
#+begin_src makefile
LOAD_PATH = -L ~/.emacs.d/site-lisp/magit/lisp
LOAD_PATH += -L ~/.emacs.d/site-lisp/compat
+ LOAD_PATH += -L ~/.emacs.d/site-lisp/cond-let
LOAD_PATH += -L ~/.emacs.d/site-lisp/llama
LOAD_PATH += -L ~/.emacs.d/site-lisp/seq
LOAD_PATH += -L ~/.emacs.d/site-lisp/transient/lisp
@@ -203,6 +204,7 @@ you have to tell Emacs about them too, by prefixing the
above with:
#+begin_src emacs-lisp
(add-to-list 'load-path "~/.emacs.d/site-lisp/compat")
+ (add-to-list 'load-path "~/.emacs.d/site-lisp/cond-let")
(add-to-list 'load-path "~/.emacs.d/site-lisp/llama")
(add-to-list 'load-path "~/.emacs.d/site-lisp/seq")
(add-to-list 'load-path "~/.emacs.d/site-lisp/transient/lisp")
diff --git a/docs/magit.texi b/docs/magit.texi
index 4e96c3aff60..28c8cc8528e 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -305,8 +305,8 @@ Now see @ref{Post-Installation Tasks}.
@node Installing from the Git Repository
@section Installing from the Git Repository
-Magit depends on the @code{compat}, @code{llama}, @code{seq} (the built-in
version is
-enough when using Emacs >= 29.1), @code{transient} and @code{with-editor}
libraries
+Magit depends on the @code{compat}, @code{cond-let}, @code{llama}, @code{seq}
(the built-in version
+is enough when using Emacs >= 29.1), @code{transient} and @code{with-editor}
libraries
which are available from Melpa and Melpa-Stable. Install them using
@code{M-x package-install RET <package> RET}. Of course you may also install
them manually from their repository.
@@ -324,15 +324,16 @@ Then compile the libraries and generate the info manuals:
$ make
@end example
-If you haven't installed @code{compat}, @code{llama}, @code{seq} (for Emacs <
29.1),
-@code{transient} and @code{with-editor} from Melpa, or at
-@code{/path/to/magit/../<package>}, then you have to tell @code{make} where to
-find them. To do so create the file @code{/path/to/magit/config.mk}
-with the following content before running @code{make}:
+If you haven't installed @code{compat}, @code{cond-let}, @code{llama},
@code{seq}
+(only for Emacs 28), @code{transient} and @code{with-editor} from Melpa, or at
+@code{/path/to/magit/../<package>}, then you have to tell @code{make} where to
find
+them. To do so create the file @code{/path/to/magit/config.mk} with the
+following content before running @code{make}:
@example
LOAD_PATH = -L ~/.emacs.d/site-lisp/magit/lisp
LOAD_PATH += -L ~/.emacs.d/site-lisp/compat
+LOAD_PATH += -L ~/.emacs.d/site-lisp/cond-let
LOAD_PATH += -L ~/.emacs.d/site-lisp/llama
LOAD_PATH += -L ~/.emacs.d/site-lisp/seq
LOAD_PATH += -L ~/.emacs.d/site-lisp/transient/lisp
@@ -355,6 +356,7 @@ you have to tell Emacs about them too, by prefixing the
above with:
@lisp
(add-to-list 'load-path "~/.emacs.d/site-lisp/compat")
+(add-to-list 'load-path "~/.emacs.d/site-lisp/cond-let")
(add-to-list 'load-path "~/.emacs.d/site-lisp/llama")
(add-to-list 'load-path "~/.emacs.d/site-lisp/seq")
(add-to-list 'load-path "~/.emacs.d/site-lisp/transient/lisp")
diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index c82dd09b823..3c430b27c8b 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -885,6 +885,7 @@ See info node `(magit)Debugging Tools' for more
information."
(error "Cannot find mandatory dependency %s" lib)))
'(;; Like `LOAD_PATH' in `default.mk'.
"compat"
+ "cond-let"
"llama"
"seq"
"transient"
