branch: elpa/magit
commit 5953361d823f85f6d94f21dc08f4ec52ca30c969
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Complete dependency lists
---
.github/ISSUE_TEMPLATE/bug_report.md | 2 +-
default.mk | 9 ++++-----
docs/magit.org | 17 ++++++++++++-----
docs/magit.texi | 17 ++++++++++++-----
lisp/magit-base.el | 10 +++++-----
5 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md
b/.github/ISSUE_TEMPLATE/bug_report.md
index 4df704a60f9..b67a8055e31 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 ../dash-N -L
../git-commit-N -L ../transient-N -L ../with-editor-N -L ../ghub-N -L . -l magit
+ $ emacs -Q --debug-init --eval '(setq debug-on-error t)' -L ../dash-N -L
../llama-N -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 170b46d5da6..1515088faad 100644
--- a/default.mk
+++ b/default.mk
@@ -191,10 +191,10 @@ endif
LOAD_PATH = -L $(TOP)lisp
-# When making changes here, then don't forget to adjust "Makefile",
-# ".github/workflows/test.yml", ".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".
+# When making changes here, then don't forget to adjust "default.mk"
+# ".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".
ifdef CYGPATH
LOAD_PATH += -L $(shell cygpath --mixed $(COMPAT_DIR))
@@ -233,7 +233,6 @@ DEPS += dash
DEPS += llama
DEPS += seq
DEPS += transient/lisp
-DEPS += vterm
DEPS += with-editor/lisp
## Publish ###########################################################
diff --git a/docs/magit.org b/docs/magit.org
index d5c15eb44b9..dd77eaae18a 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -153,7 +153,8 @@ Now see [[*Post-Installation Tasks]].
** Installing from the Git Repository
-Magit depends on the ~compat~, ~dash~, ~transient~ and ~with-editor~ libraries
+Magit depends on the ~compat~, ~dash~, ~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.
@@ -171,17 +172,20 @@ Then compile the libraries and generate the info manuals:
$ make
#+end_src
-If you haven't installed ~compat~, ~dash~, ~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~
+If you haven't installed ~compat~, ~dash~, ~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~:
#+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/dash
+ 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
LOAD_PATH += -L ~/.emacs.d/site-lisp/with-editor/lisp
- LOAD_PATH += -L ~/.emacs.d/site-lisp/compat
#+end_src
Finally add this to your init file:
@@ -199,7 +203,10 @@ Of course if you installed the dependencies manually as
well, then
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/dash")
+ (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")
(add-to-list 'load-path "~/.emacs.d/site-lisp/with-editor")
#+end_src
diff --git a/docs/magit.texi b/docs/magit.texi
index 05ad9a0d441..7ad9e26402a 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -305,7 +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{dash}, @code{transient} and
@code{with-editor} libraries
+Magit depends on the @code{compat}, @code{dash}, @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.
@@ -323,17 +324,20 @@ Then compile the libraries and generate the info manuals:
$ make
@end example
-If you haven't installed @code{compat}, @code{dash}, @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}
+If you haven't installed @code{compat}, @code{dash}, @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}:
@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/dash
+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
LOAD_PATH += -L ~/.emacs.d/site-lisp/with-editor/lisp
-LOAD_PATH += -L ~/.emacs.d/site-lisp/compat
@end example
Finally add this to your init file:
@@ -351,7 +355,10 @@ Of course if you installed the dependencies manually as
well, then
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/dash")
+(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")
(add-to-list 'load-path "~/.emacs.d/site-lisp/with-editor")
@end lisp
diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index 00633367368..30d69d126cb 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -883,15 +883,15 @@ See info node `(magit)Debugging Tools' for more
information."
'(;; Like `LOAD_PATH' in `default.mk'.
"compat"
"dash"
+ "llama"
+ "seq"
"transient"
"with-editor"
;; Obviously `magit' itself is needed too.
"magit"
- ;; While these are part of the Magit repository,
- ;; they are distributed as separate packages.
- "magit-section"
- "git-commit"
- ))))
+ ;; While this is part of the Magit repository,
+ ;; it is distributed as a separate package.
+ "magit-section"))))
;; Avoid Emacs bug#16406 by using full path.
"-l" ,(file-name-sans-extension (locate-library "magit")))
" ")))
